Fix folder creation error (Bug#67361)

* lisp/mh-e/mh-funcs.el (mh-kill-folder)
* lisp/mh-e/mh-search.el (mh-index-new-folder)
* lisp/mh-e/mh-utils.el (mh-prompt-for-folder):
Check for existence of 'speedbar-buffer' rather than
'mh-speed-folder-map'.  The latter can exist if
'mh-speed' has only been loaded but not displayed.

(cherry picked from commit e6a2901b1be6b4aa01f8bf0d3c6e06344ce8d366)

diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 2684722eb263e5f0b9bc1c5c8392a0d8c19a4ecf..bb3e67467d5068ec339fbc2b37c1efeaf7f551ff 100644 (file)
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -108,7 +108,7 @@ folder. This is useful for folders that are easily regenerated."
             (window-config mh-previous-window-config))
         (mh-set-folder-modified-p t)    ; lock folder to kill it
         (mh-exec-cmd-daemon "rmf" 'mh-rmf-daemon folder)
-        (when (boundp 'mh-speed-folder-map)
+        (when (and (boundp 'speedbar-buffer) speedbar-buffer)
           (mh-speed-invalidate-map folder))
         (mh-remove-from-sub-folders-cache folder)
         (mh-set-folder-modified-p nil)  ; so kill-buffer doesn't complain

diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index f475973631c08fb42e1b9de83d4378811523b213..59dad161c1111f0cbce26065214a6d70c4059ec4 100644 (file)
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1569,7 +1569,7 @@ If the folder returned doesn't exist then it is created."
     (save-excursion (mh-exec-cmd-quiet nil "rmf" chosen-name))
     (mh-exec-cmd-quiet nil "folder" "-create" "-fast" chosen-name)
     (mh-remove-from-sub-folders-cache chosen-name)
-    (when (boundp 'mh-speed-folder-map)
+    (when (and (boundp 'speedbar-buffer) speedbar-buffer)
       (mh-speed-add-folder chosen-name))
     chosen-name))
 

diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 7943879d887128d41255fe44ff75fd3dad118cd2..9d5711105ba9c6a9ab5899c01f81200fa10c2db8 100644 (file)
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -795,7 +795,7 @@ used in searching."
              (message "Creating %s" folder-name)
              (mh-exec-cmd-error nil "folder" folder-name)
              (mh-remove-from-sub-folders-cache folder-name)
-             (when (boundp 'mh-speed-folder-map)
+             (when (and (boundp 'speedbar-buffer) speedbar-buffer)
                (mh-speed-add-folder folder-name))
              (message "Creating %s...done" folder-name))
             (new-file-flag