Mercurial > emacs

diff lisp/gnus/gnus-group.el @ 44344:37801f2191c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* gnus-group.el (gnus-group-make-tool-bar): Load tool-bar first. * message.el (message-tool-bar-map): Ditto. * gnus-sum.el (gnus-summary-make-tool-bar): Ditto.
author ShengHuo ZHU <zsh@cs.rochester.edu>
date Tue, 02 Apr 2002 20:24:32 +0000
parents 89437b1f5f66
children 52d99cc2e9e3
line wrap: on
line diff
--- a/lisp/gnus/gnus-group.el	Tue Apr 02 19:37:29 2002 +0000
+++ b/lisp/gnus/gnus-group.el	Tue Apr 02 20:24:32 2002 +0000
@@ -822,9 +822,11 @@
 
 ;; 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))
+  (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