summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/mh-e/ChangeLog6
-rw-r--r--lisp/mh-e/mh-tool-bar.el4
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 1ce5ff87b6d..85e4ddbfe6b 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-03 Mark D. Baushke <mdb@gnu.org>
+
+ * mh-tool-bar.el: Add conditional require of 'tool-bar or 'toolbar
+ for gnu-emacs or xemacs to avoid void-variable tool-bar-map lisp
+ errors if describe-bindings is called before tool-bar-mode is used.
+
2006-02-03 Peter S Galbraith <psg@debian.org>
* mh-compat.el (mh-url-unreserved-chars): Fix typo from
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index ebf07a77672..20b239189fa 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -31,6 +31,10 @@
;;; Code:
(require 'mh-e)
+(mh-do-in-gnu-emacs
+ (require 'tool-bar))
+(mh-do-in-xemacs
+ (require 'toolbar))
;;; Tool Bar Commands