summaryrefslogtreecommitdiff
path: root/lisp/mh-e
diff options
context:
space:
mode:
authorMike Kupfer <kupfer@rawbw.com>2024-01-15 11:47:43 -0800
committerEli Zaretskii <eliz@gnu.org>2024-01-16 14:22:39 +0200
commitd4b9cb6b5b640e8d769c82289e4308407be12ba9 (patch)
tree008e727194503541aff6ba1c1fcb93a22549137a /lisp/mh-e
parent53b5b77010117e2f58565dacf96fddeb734b6021 (diff)
downloademacs-d4b9cb6b5b640e8d769c82289e4308407be12ba9.tar.gz
emacs-d4b9cb6b5b640e8d769c82289e4308407be12ba9.tar.bz2
emacs-d4b9cb6b5b640e8d769c82289e4308407be12ba9.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. (cherry picked from commit e6a2901b1be6b4aa01f8bf0d3c6e06344ce8d366)
Diffstat (limited to 'lisp/mh-e')
-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."
(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 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."
(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 7943879d887..9d5711105ba 100644
--- 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