diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2017-04-16 17:07:44 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2017-04-16 17:07:44 -0400 |
| commit | 7fb6ab52c4d651eb80622304daa8164d89a275f9 (patch) | |
| tree | fabaab535cf0c4ac6bbb0c30155e981b73e28f55 | |
| parent | de7e495e4616505ceb8d9532e6378f1ad46b08ff (diff) | |
| download | org-mode-7fb6ab52c4d651eb80622304daa8164d89a275f9.tar.gz | |
Don't call kill-this-buffer outside of menus
* contrib/lisp/org-toc.el (org-toc-quit):
* lisp/org-mhe.el (org-mhe-follow-link): Use kill-buffer rather than
menu-bar.el's kill-this-buffer.
See Emacs bug#26466 and discussion on emacs.devel:
https://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00346.html.
This is in favor of backporting Emacs's 2e4f4c9d48 (Don't call
'kill-this-buffer' outside of menus, 2017-04-12), which introduces a
new function kill-current-buffer that provides special handling of
minibuffers.
| -rw-r--r-- | contrib/lisp/org-toc.el | 2 | ||||
| -rw-r--r-- | lisp/org-mhe.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el index 8b4c36c..1c14a4f 100644 --- a/contrib/lisp/org-toc.el +++ b/contrib/lisp/org-toc.el @@ -354,7 +354,7 @@ If DELETE is non-nil, delete other windows when in the Org buffer." (defun org-toc-quit () "Quit the current Org TOC buffer." (interactive) - (kill-this-buffer) + (kill-buffer) (other-window 1) (delete-other-windows)) diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el index 1c1c5ef..4142ae4 100644 --- a/lisp/org-mhe.el +++ b/lisp/org-mhe.el @@ -203,7 +203,7 @@ folders." (mh-search folder (list "--message-id" article)) (when (and org-mhe-search-all-folders (not (org-mhe-get-message-real-folder))) - (kill-this-buffer) + (kill-buffer) (mh-search "+" (list "--message-id" article)))) (if mh-search-regexp-builder (mh-search "+" (funcall mh-search-regexp-builder @@ -211,7 +211,7 @@ folders." (mh-search "+" article))) (if (org-mhe-get-message-real-folder) (mh-show-msg 1) - (kill-this-buffer) + (kill-buffer) (error "Message not found")))) (provide 'org-mhe) |