branch: externals/org
commit 9194ad5dc64e93fc1209a0de0e1df7ac6fec59ce
Author: Juri Linkov <j...@linkov.net>
Commit: Kyle Meyer <k...@kyleam.com>
Backport commit d706be4b3 from Emacs
* lisp/ol-eshell.el (org-eshell-open): Add '(category . comint)'.
Remove obsolete 'display-comint-buffer-action' (bug#74361)
d706be4b345f3e2d242c4f2ffb5e566845b2935d
Juri Linkov
Wed Dec 4 09:40:33 2024 +0200
---
lisp/ol-eshell.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/ol-eshell.el b/lisp/ol-eshell.el
index fe22fb2104..6e54d0e3ca 100644
--- a/lisp/ol-eshell.el
+++ b/lisp/ol-eshell.el
@@ -51,9 +51,9 @@ followed by a colon."
(if (get-buffer eshell-buffer-name)
(pop-to-buffer
eshell-buffer-name
- (if (boundp 'display-comint-buffer-action) ; Emacs >= 29
+ (if (boundp 'display-comint-buffer-action) ; Emacs >= 29, <= 30
display-comint-buffer-action
- '(display-buffer-same-window (inhibit-same-window))))
+ '(display-buffer-same-window (inhibit-same-window) (category .
comint))))
(eshell))
(goto-char (point-max))
(eshell-kill-input)
