diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2022-11-29 23:05:53 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2022-11-29 23:05:53 -0500 |
| commit | 0625651e8a61c9effc31ff771f15885a3a37c6e6 (patch) | |
| tree | db4c09e8ef119ad4a9a4028c5e615fd58d2dee69 /lisp/org/ol-eshell.el | |
| parent | edd64e64a389e0f0e6ce670846d4fae79a9d8b35 (diff) | |
| download | emacs-0625651e8a61c9effc31ff771f15885a3a37c6e6.tar.gz emacs-0625651e8a61c9effc31ff771f15885a3a37c6e6.tar.bz2 emacs-0625651e8a61c9effc31ff771f15885a3a37c6e6.zip | |
Update to Org 9.6-3-ga4d38e
Diffstat (limited to 'lisp/org/ol-eshell.el')
| -rw-r--r-- | lisp/org/ol-eshell.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/org/ol-eshell.el b/lisp/org/ol-eshell.el index 1ca2aa2b28b..3be63601ddd 100644 --- a/lisp/org/ol-eshell.el +++ b/lisp/org/ol-eshell.el @@ -23,6 +23,9 @@ ;;; Code: +(require 'org-macs) +(org-assert-version) + (require 'eshell) (require 'esh-mode) (require 'ol) @@ -46,7 +49,11 @@ followed by a colon." (eshell-buffer-name (car buffer-and-command)) (command (cadr buffer-and-command))) (if (get-buffer eshell-buffer-name) - (pop-to-buffer eshell-buffer-name display-comint-buffer-action) + (pop-to-buffer + eshell-buffer-name + (if (boundp 'display-comint-buffer-action) ; Emacs >= 29 + display-comint-buffer-action + '(display-buffer-same-window (inhibit-same-window)))) (eshell)) (goto-char (point-max)) (eshell-kill-input) |