mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-21 06:55:35 +00:00
org-babel-sh-prompt: Fix Emacs 27 CI failures
* lisp/ob-shell.el (org-babel-sh-prompt): Use the old prompt for Emacs 27. CI fails on Debian + Emacs 27 when running tests, even though Emacs 27 tests do pass on my system. Play it safe and fall back to the old prompt for Emacs 27, to avoid possible breakage. Emacs 27 support is going to be dropped soon anyway, after Emacs 30 release.
This commit is contained in:
parent
62b88d613e
commit
54af540af6
@ -273,7 +273,10 @@ var of the same value."
|
|||||||
"String to indicate that evaluation has completed.")
|
"String to indicate that evaluation has completed.")
|
||||||
(defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
|
(defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
|
||||||
"String to indicate that evaluation has completed.")
|
"String to indicate that evaluation has completed.")
|
||||||
(defvar org-babel-sh-prompt "𒆸 "
|
(defvar org-babel-sh-prompt
|
||||||
|
;; FIXME: Emacs 27 CI fails non-interactively. Play it safe and
|
||||||
|
;; keep the old prompt until we drop Emacs 27 support.
|
||||||
|
(if (version< emacs-version "28") "org_babel_sh_prompt> " "𒆸 ")
|
||||||
"String to set prompt in session shell.")
|
"String to set prompt in session shell.")
|
||||||
|
|
||||||
(defvar-local org-babel-sh--prompt-initialized nil
|
(defvar-local org-babel-sh--prompt-initialized nil
|
||||||
|
Loading…
Reference in New Issue
Block a user