From 54af540af6b153dabec4e5a1d7e5a8035e47ba42 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Tue, 6 Aug 2024 20:09:55 +0200 Subject: [PATCH] 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. --- lisp/ob-shell.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el index 76908315f..770623491 100644 --- a/lisp/ob-shell.el +++ b/lisp/ob-shell.el @@ -273,7 +273,10 @@ var of the same value." "String to indicate that evaluation has completed.") (defvar org-babel-sh-eoe-output "org_babel_sh_eoe" "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.") (defvar-local org-babel-sh--prompt-initialized nil