From 45893d487acf545d3c684df35f53eb3d1cbbd282 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Thu, 26 Jan 2006 14:57:44 +0000 Subject: [PATCH] * gnus-sum.el (gnus-summary-make-tool-bar): Add checks for XEmacs and tool-bar-mode. * gnus-group.el (gnus-group-make-tool-bar): Add checks for XEmacs and tool-bar-mode. * message.el (message-tool-bar-update): Simlify. (message-make-tool-bar): Add checks for XEmacs and tool-bar-mode. * gnus-sum.el (gnus-summary-tool-bar-update): Check for gnus-summary-buffer. (gnus-summary-tool-bar-gnome): Use "reply-author" icon for gnus-summary-reply. --- lisp/ChangeLog | 9 +++++++++ lisp/gnus-group.el | 7 ++++++- lisp/gnus-sum.el | 5 ++++- lisp/message.el | 15 ++++++++------- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bc3fa1dc7..a8fa26ac0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2006-01-26 Reiner Steib + * gnus-sum.el (gnus-summary-make-tool-bar): Add checks for XEmacs + and tool-bar-mode. + + * gnus-group.el (gnus-group-make-tool-bar): Add checks for XEmacs + and tool-bar-mode. + + * message.el (message-tool-bar-update): Simlify. + (message-make-tool-bar): Add checks for XEmacs and tool-bar-mode. + * gnus-sum.el (gnus-summary-tool-bar-update): Check for gnus-summary-buffer. (gnus-summary-tool-bar-gnome): Use "reply-author" icon for diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index ae802399a..3f42f1d08 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1109,7 +1109,12 @@ See `gmm-tool-bar-from-list' for the format of the list." (defun gnus-group-make-tool-bar (&optional force) "Make a group mode tool bar from `gnus-group-tool-bar'. When FORCE, rebuild the tool bar." - (when (or (not gnus-group-tool-bar-map) force) + (when (and (not (featurep 'xemacs)) + (boundp 'tool-bar-mode) + tool-bar-mode + ;; 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 diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 15f2d9487..eb11a9b7c 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2765,7 +2765,10 @@ See `gmm-tool-bar-from-list' for the format of the list." (defun gnus-summary-make-tool-bar (&optional force) "Make a summary mode tool bar from `gnus-summary-tool-bar'. When FORCE, rebuild the tool bar." - (when (or (not gnus-summary-tool-bar-map) force) + (when (and (not (featurep 'xemacs)) + (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 diff --git a/lisp/message.el b/lisp/message.el index bdb57da33..90f544fad 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -6711,12 +6711,10 @@ which specify the range to operate on." (defun message-tool-bar-update (&optional symbol value) "Update message mode toolbar. Setter function for custom variables." - (if symbol - ;; When used as ":set" function: - (progn - (set-default symbol value) - (setq-default message-tool-bar-map nil)) - (message-make-tool-bar t))) + (setq-default message-tool-bar-map nil) + (when symbol + ;; When used as ":set" function: + (set-default symbol value))) ;; The default will be changed when the new icons have been checked in: (defcustom message-tool-bar 'message-tool-bar-retro @@ -6801,7 +6799,10 @@ See `gmm-tool-bar-from-list' for the format of the list." (defun message-make-tool-bar (&optional force) "Make a message mode tool bar from `message-tool-bar-list'. When FORCE, rebuild the tool bar." - (when (or (not message-tool-bar-map) force) + (when (and (not (featurep 'xemacs)) + (boundp 'tool-bar-mode) + 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))) -- 2.34.1