2 files changed, 13 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bd3cc2dbe2f..55342810a79 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-09  Dave Love  <fx@gnu.org>
+
+        * message.el (tool-bar-map): Defvar when compiling.
+
+        * gnus-setup.el (running-xemacs, gnus-use-installed-tm)
+        (gnus-tm-lisp-directory): Deleted.
+        (gnus-use-installed-mailcrypt, gnus-emacs-lisp-directory): Use
+        (featurep 'xemacs).
+        (gnus-gnus-lisp-directory, gnus-mailcrypt-lisp-directory) 
+        (gnus-mailcrypt-lisp-directory, gnus-bbdb-lisp-directory): Remove
+        version numbers from file names.
+
 2000-11-08  John Wiegley  <johnw@gnu.org>
 
         * gnus-topic.el (gnus-topic-mode): Use `setq' to clear
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 287b565c4d4..03d5b2dce21 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4327,6 +4327,7 @@ which specify the range to operate on."
 (defalias 'message-exchange-point-and-mark 'exchange-point-and-mark)
 
 ;; Support for toolbar
+(eval-when-compile (defvar tool-bar-map))
 (if (featurep 'xemacs)
     (require 'messagexmas)
   (when (and (fboundp 'tool-bar-add-item-from-menu)