Synch to No Gnus 200601302345.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5c09ac..504d2e5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el: Bind tool-bar-mode instead of tool-bar-map when
+       compiling.
+
+       * gnus-sum.el: Ditto.
+
+       * message.el: Don't bind tool-bar-map when compiling.
+
 2006-01-30  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnweb.el (nnweb-google-parse-1): Clarify some comments.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 3a6ac01..cba46bb 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -29,7 +29,7 @@
 
 (eval-when-compile
   (require 'cl)
-  (defvar tool-bar-map))
+  (defvar tool-bar-mode))
 
 (require 'gnus)
 (require 'gnus-start)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 2fae1d0..abbc7d9 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -31,7 +31,7 @@
 
 (eval-when-compile
   (require 'cl)
-  (defvar tool-bar-map))
+  (defvar tool-bar-mode))
 
 (require 'gnus)
 (require 'gnus-group)

diff --git a/lisp/message.el b/lisp/message.el
index 7cbc70c..cb13a15 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7422,7 +7422,6 @@ which specify the range to operate on."
 
 ;; Support for toolbar
 (eval-when-compile
-  (defvar tool-bar-map)
   (defvar tool-bar-mode))
 
 ;; Note: The :set function in the `message-tool-bar*' variables will only