(mh-tool-bar-define): Fix enable-expr so that one can permenently

disable a button (such as a separator) with nil.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 72c7a87f25747bd9d6b5091c135bb4c06b2c7315..545b799b5609d1f4c2e7bad72fe49c3efa2fb2d1 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-19  Bill Wohler  <wohler@newt.com>
+
+       * mh-tool-bar.el (mh-tool-bar-define): Fix enable-expr so that one
+       can permenently disable a button (such as a separator) with nil.
+
 2006-04-18  Bill Wohler  <wohler@newt.com>
 
        * mh-e.el (defcustom-mh, defface-mh, defgroup-mh, mh-face-data)

diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index fccf83cf8d6b7900014ecada363ecb3b2e59c427..3cd043d4a7ef7f9795b06c99561c3b3d8a02c7dc 100644 (file)
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -151,7 +151,7 @@ where,
              (doc (if (string-match "\\(.*\\)\n" full-doc)
                       (match-string 1 full-doc)
                     full-doc))
-             (enable-expr (or (nth 4 button) t))
+             (enable-expr (if (eql (length button) 4) t (nth 4 button)))
              (modes (nth 1 button))
              functions show-sym)
         (when (memq 'letter modes) (setq functions `(:letter ,name)))
@@ -318,7 +318,8 @@ where,
         'mh-tool-bar-folder-buttons
         '(list ,@(mapcar (lambda (x) `(quote ,x)) folder-defaults))
         "List of buttons to include in MH-Folder tool bar."
-        :group 'mh-tool-bar :set 'mh-tool-bar-folder-buttons-set
+        :group 'mh-tool-bar
+        :set 'mh-tool-bar-folder-buttons-set
         :type '(set ,@(loop for x in folder-buttons
                             for y in folder-docs
                             collect `(const :tag ,y ,x)))
@@ -328,7 +329,8 @@ where,
         'mh-tool-bar-letter-buttons
         '(list ,@(mapcar (lambda (x) `(quote ,x)) letter-defaults))
         "List of buttons to include in MH-Letter tool bar."
-        :group 'mh-tool-bar :set 'mh-tool-bar-letter-buttons-set
+        :group 'mh-tool-bar
+        :set 'mh-tool-bar-letter-buttons-set
         :type '(set ,@(loop for x in letter-buttons
                             for y in letter-docs
                             collect `(const :tag ,y ,x)))