From: Mark D. Baushke Date: Fri, 3 Feb 2006 19:32:06 +0000 (+0000) Subject: * mh-tool-bar.el: Add conditional require of 'tool-bar or 'toolbar X-Git-Tag: emacs-pretest-22.0.90~4388 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f169fdd35f6b8d074a2d5b3c650cc62e159ac027;p=emacs.git * 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. --- 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 + + * 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 * 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