* gnus-group.el (gnus-group-make-tool-bar): Remove duplicate check

for `tool-bar-mode' and don't check it's default-value.

* gnus-sum.el (gnus-summary-make-tool-bar): Ditto.

* message.el (message-make-tool-bar): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d987674..3e169e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2006-02-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-group.el (gnus-group-make-tool-bar): Remove duplicate check
+       for `tool-bar-mode' and don't check it's default-value.
+
+       * gnus-sum.el (gnus-summary-make-tool-bar): Ditto.
+
+       * message.el (message-make-tool-bar): Ditto.
+
        * gnus-art.el (gnus-article-browse-html-parts): Remove useless
        `substring'.  Shorten tmp-file name.
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 54140f2..286bd7e 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1115,11 +1115,10 @@ When FORCE, rebuild the tool bar."
             ;; The Gnus 5.10.6 code checked (default-value 'tool-bar-mode).
             ;; Why?  --rsteib
             (or (not gnus-group-tool-bar-map) force))
-    (let ((map (when (default-value 'tool-bar-mode)
-                (let ((load-path (mm-image-load-path)))
-                  (gmm-tool-bar-from-list gnus-group-tool-bar
-                                              gnus-group-tool-bar-zap-list
-                                              'gnus-group-mode-map)))))
+    (let* ((load-path (mm-image-load-path))
+          (map (gmm-tool-bar-from-list gnus-group-tool-bar
+                                       gnus-group-tool-bar-zap-list
+                                       'gnus-group-mode-map)))
       (if map
          (set (make-local-variable 'tool-bar-map) map))))
   gnus-group-tool-bar-map)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 5a61b3d..b1e1cc8 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2705,7 +2705,7 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
     (gnus-summary-insert-new-articles "inbox")
     ;;
     (gnus-summary-exit "exit-mode")
-    ;;
+    ;; (customize-group 'gnus-summary) "preferences"
     (gnus-info-find-node "help"))
   "List of functions for the summary tool bar (GNOME style).
 
@@ -2769,11 +2769,10 @@ When FORCE, rebuild the tool bar."
             (boundp 'tool-bar-mode)
             tool-bar-mode
             (or (not gnus-summary-tool-bar-map) force))
-    (let ((map (when (default-value 'tool-bar-mode)
-                (let ((load-path (mm-image-load-path)))
-                  (gmm-tool-bar-from-list gnus-summary-tool-bar
-                                              gnus-summary-tool-bar-zap-list
-                                              'gnus-summary-mode-map)))))
+    (let* ((load-path (mm-image-load-path))
+          (map (gmm-tool-bar-from-list gnus-summary-tool-bar
+                                       gnus-summary-tool-bar-zap-list
+                                       'gnus-summary-mode-map)))
       (when map
        ;; Need to set `gnus-summary-tool-bar-map' because `gnus-article-mode'
        ;; uses it's value.

diff --git a/lisp/message.el b/lisp/message.el
index c70f2d2..d4592fd 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6803,11 +6803,10 @@ When FORCE, rebuild the tool bar."
             tool-bar-mode
             (or (not message-tool-bar-map) force))
     (setq message-tool-bar-map
-         (when (default-value 'tool-bar-mode)
-           (let ((load-path (mm-image-load-path)))
-             (gmm-tool-bar-from-list message-tool-bar
-                                         message-tool-bar-zap-list
-                                         'message-mode-map)))))
+         (let ((load-path (mm-image-load-path)))
+           (gmm-tool-bar-from-list message-tool-bar
+                                   message-tool-bar-zap-list
+                                   'message-mode-map))))
   message-tool-bar-map)
 
 ;;; Group name completion.