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

[ShengHuo ZHU]

Index: emacs/lisp/gnus/gnus-group.el
diff -c emacs/lisp/gnus/gnus-group.el:1.18 emacs/lisp/gnus/gnus-group.el:1.19
*** emacs/lisp/gnus/gnus-group.el:1.18  Tue Dec  4 14:28:25 2001
--- emacs/lisp/gnus/gnus-group.el       Tue Apr  2 15:24:32 2002
***************
*** 822,830 ****
  
  ;; Emacs 21 tool bar.  Should be no-op otherwise.
  (defun gnus-group-make-tool-bar ()
!   (if (and (fboundp 'tool-bar-add-item-from-menu)
!          (default-value 'tool-bar-mode)
!          (not gnus-group-toolbar-map))
        (setq gnus-group-toolbar-map
            (let ((tool-bar-map (make-sparse-keymap)))
              (tool-bar-add-item-from-menu
--- 822,832 ----
  
  ;; Emacs 21 tool bar.  Should be no-op otherwise.
  (defun gnus-group-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-group-toolbar-map))
        (setq gnus-group-toolbar-map
            (let ((tool-bar-map (make-sparse-keymap)))
              (tool-bar-add-item-from-menu