aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kupfer2024-01-15 11:47:43 -0800
committerBill Wohler2024-01-15 17:34:18 -0800
commite6a2901b1be6b4aa01f8bf0d3c6e06344ce8d366 (patch)
tree22bea84802feb7d24fe7e573a9094d7e7daf3d70
parent27ff4d9c4956fe06c59f342def8b35d32bbc3b50 (diff)
downloademacs-e6a2901b1be6b4aa01f8bf0d3c6e06344ce8d366.tar.gz
emacs-e6a2901b1be6b4aa01f8bf0d3c6e06344ce8d366.zip
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.
-rw-r--r--lisp/mh-e/mh-funcs.el2
-rw-r--r--lisp/mh-e/mh-search.el2
-rw-r--r--lisp/mh-e/mh-utils.el2
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 2684722eb26..bb3e67467d5 100644
--- 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."
108 (window-config mh-previous-window-config)) 108 (window-config mh-previous-window-config))
109 (mh-set-folder-modified-p t) ; lock folder to kill it 109 (mh-set-folder-modified-p t) ; lock folder to kill it
110 (mh-exec-cmd-daemon "rmf" 'mh-rmf-daemon folder) 110 (mh-exec-cmd-daemon "rmf" 'mh-rmf-daemon folder)
111 (when (boundp 'mh-speed-folder-map) 111 (when (and (boundp 'speedbar-buffer) speedbar-buffer)
112 (mh-speed-invalidate-map folder)) 112 (mh-speed-invalidate-map folder))
113 (mh-remove-from-sub-folders-cache folder) 113 (mh-remove-from-sub-folders-cache folder)
114 (mh-set-folder-modified-p nil) ; so kill-buffer doesn't complain 114 (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 f475973631c..59dad161c11 100644
--- 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."
1569 (save-excursion (mh-exec-cmd-quiet nil "rmf" chosen-name)) 1569 (save-excursion (mh-exec-cmd-quiet nil "rmf" chosen-name))
1570 (mh-exec-cmd-quiet nil "folder" "-create" "-fast" chosen-name) 1570 (mh-exec-cmd-quiet nil "folder" "-create" "-fast" chosen-name)
1571 (mh-remove-from-sub-folders-cache chosen-name) 1571 (mh-remove-from-sub-folders-cache chosen-name)
1572 (when (boundp 'mh-speed-folder-map) 1572 (when (and (boundp 'speedbar-buffer) speedbar-buffer)
1573 (mh-speed-add-folder chosen-name)) 1573 (mh-speed-add-folder chosen-name))
1574 chosen-name)) 1574 chosen-name))
1575 1575
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 7943879d887..9d5711105ba 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -795,7 +795,7 @@ used in searching."
795 (message "Creating %s" folder-name) 795 (message "Creating %s" folder-name)
796 (mh-exec-cmd-error nil "folder" folder-name) 796 (mh-exec-cmd-error nil "folder" folder-name)
797 (mh-remove-from-sub-folders-cache folder-name) 797 (mh-remove-from-sub-folders-cache folder-name)
798 (when (boundp 'mh-speed-folder-map) 798 (when (and (boundp 'speedbar-buffer) speedbar-buffer)
799 (mh-speed-add-folder folder-name)) 799 (mh-speed-add-folder folder-name))
800 (message "Creating %s...done" folder-name)) 800 (message "Creating %s...done" folder-name))
801 (new-file-flag 801 (new-file-flag