[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-sum.el

[ShengHuo ZHU]

Index: emacs/lisp/gnus/gnus-sum.el
diff -c emacs/lisp/gnus/gnus-sum.el:1.29 emacs/lisp/gnus/gnus-sum.el:1.30
*** emacs/lisp/gnus/gnus-sum.el:1.29    Sat Feb 16 14:03:14 2002
--- emacs/lisp/gnus/gnus-sum.el Tue Apr  2 15:24:32 2002
***************
*** 2010,2019 ****
  (defvar gnus-summary-tool-bar-map nil)
  
  ;; Emacs 21 tool bar.  Should be no-op otherwise.
  (defun gnus-summary-make-tool-bar ()
!   (if (and (fboundp 'tool-bar-add-item-from-menu)
!          (default-value 'tool-bar-mode)
!          (not gnus-summary-tool-bar-map))
        (setq gnus-summary-tool-bar-map
            (let ((tool-bar-map (make-sparse-keymap)))
              (tool-bar-add-item-from-menu
--- 2010,2024 ----
  (defvar gnus-summary-tool-bar-map nil)
  
  ;; Emacs 21 tool bar.  Should be no-op otherwise.
+ ;; NB: A new function tool-bar-local-item-from-menu is added in Emacs
+ ;; 21.2.50+.  Considering many users use Emacs 21, use
+ ;; tool-bar-add-item-from-menu here.
  (defun gnus-summary-make-tool-bar ()
!   (if (and
!        (condition-case nil (require 'tool-bar) (error nil))
!        (fboundp 'tool-bar-add-item-from-menu)
!        (default-value 'tool-bar-mode)
!        (not gnus-summary-tool-bar-map))
        (setq gnus-summary-tool-bar-map
            (let ((tool-bar-map (make-sparse-keymap)))
              (tool-bar-add-item-from-menu