Merge from origin/emacs-25

[gnu-emacs] / lisp / sb-image.el

diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index 31488448bea3c73144a7082b76add3b6d5b3e4d6..6d68fc8e4fa6bc1ed4a88bdcc68da1f96af7c68b 100644 (file)
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -1,17 +1,16 @@
 ;;; sb-image --- Image management for speedbar
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2003, 2005-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -39,7 +36,7 @@
 
 ;;; Code:
 (defcustom speedbar-use-images ezimage-use-images
-  "*Non-nil if speedbar should display icons."
+  "Non-nil if speedbar should display icons."
   :group 'speedbar
   :version "21.1"
   :type 'boolean)
@@ -87,8 +84,7 @@ If we have an image associated with it, use that image."
 See `speedbar-expand-image-button-alist' for details."
   (interactive)
   (with-output-to-temp-buffer "*Speedbar Images*"
-    (save-excursion
-      (set-buffer "*Speedbar Images*")
+    (with-current-buffer "*Speedbar Images*"
       (goto-char (point-max))
       (insert "Speedbar image cache.\n\n")
       (let ((start (point)) (end nil))
@@ -108,5 +104,4 @@ See `speedbar-expand-image-button-alist' for details."
 
 (provide 'sb-image)
 
-;; arch-tag: 6b05accd-e8b8-4290-8379-f063f3dacabb
 ;;; sb-image.el ends here