From 44d9f035b3e1130db2e058442c1b9dff801a7f46 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 30 Nov 2005 23:06:28 +0000 Subject: [PATCH] Synch to No Gnus 200511302306. --- lisp/ChangeLog | 7 +++++++ lisp/gnus-xmas.el | 5 ++++- lisp/messagexmas.el | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ef53cb..a7f0930 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-11-30 Katsumi Yamaoka + + * gnus-xmas.el (gnus-use-toolbar): Determine the default value + according to default-toolbar-visible-p. + + * messagexmas.el (message-use-toolbar): Ditto. + 2005-11-26 Dave Love * tls.el (open-tls-stream): Rename arg SERVICE to PORT. diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index 0962b9a..70ddeba 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -614,7 +614,10 @@ the resulting string may be narrower than END-COLUMN. ((eq major-mode 'gnus-summary-mode) (gnus-xmas-setup-summary-toolbar))))))) -(defcustom gnus-use-toolbar (if (featurep 'toolbar) 'default) +(defcustom gnus-use-toolbar + (if (and (featurep 'toolbar) + (specifier-instance default-toolbar-visible-p)) + 'default) "*Position to display the toolbar. Nil means do not use a toolbar. If it is non-nil, it should be one of the symbols `default', `top', `bottom', `right', and `left'. `default' means to use the default diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el index 31438db..67f9a6a 100644 --- a/lisp/messagexmas.el +++ b/lisp/messagexmas.el @@ -38,7 +38,10 @@ If this variable is nil, Message will try to locate the directory automatically.") -(defvar message-use-toolbar (if (featurep 'toolbar) 'default) +(defvar message-use-toolbar + (if (and (featurep 'toolbar) + (specifier-instance default-toolbar-visible-p)) + 'default) "*Position to display the toolbar. Nil means do not use a toolbar. If it is non-nil, it should be one of the symbols `default', `top', `bottom', `right', and `left'. `default' means to use the default -- 1.7.10.4