diff options
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 11 | ||||
| -rw-r--r-- | test/lisp/eshell/esh-cmd-tests.el | 14 |
2 files changed, 22 insertions, 3 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 0b3137127d2..e97e4f6d067 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1030,6 +1030,9 @@ process(es) in a cons cell like: PROC is the process that invoked this from its sentinel, and STATUS is its status." (when proc + ;; Iterate over all the commands associated with this process. Each + ;; element is a list of the form (BACKGROUND FORM PROCESSES) (see + ;; `eshell-add-command'). (dolist (command (eshell-commands-for-process proc)) (unless (seq-some #'eshell-process-active-p (nth 2 command)) (setf (nth 2 command) nil) ; Clear processes from command. @@ -1040,8 +1043,12 @@ STATUS is its status." (not (string-match eshell-reset-signals status))) (eshell-resume-eval command) (eshell-remove-command command) - (declare-function eshell-reset "esh-mode" (&optional no-hooks)) - (eshell-reset)))))) + ;; Check if the command we just aborted is marked as a + ;; background command. If not, we need to reset the prompt so + ;; the user can enter another command. + (unless (car command) + (declare-function eshell-reset "esh-mode" (&optional no-hooks)) + (eshell-reset))))))) (defun eshell-resume-eval (command) "Destructively evaluate a COMMAND which may need to be deferred. diff --git a/test/lisp/eshell/esh-cmd-tests.el b/test/lisp/eshell/esh-cmd-tests.el index 70e1901c169..d8124a19af6 100644 --- a/test/lisp/eshell/esh-cmd-tests.el +++ b/test/lisp/eshell/esh-cmd-tests.el @@ -113,7 +113,7 @@ bug#59469." (with-temp-eshell (eshell-match-command-output (format "*echo hi > #<%s> &" bufname) - (rx "[echo" (? ".exe") "] " (+ digit) "\n")) + (rx bos "[echo" (? ".exe") "] " (+ digit) "\n")) (eshell-wait-for-subprocess t)) (should (equal (buffer-string) "hi\n")))) @@ -129,6 +129,18 @@ bug#59469." (eshell-wait-for-subprocess t)) (should (equal (buffer-string) "olleh\n")))) +(ert-deftest esh-cmd-test/background/kill () + "Make sure that a background command that gets killed doesn't emit a prompt." + (skip-unless (executable-find "sleep")) + (let ((background-message (rx bos "[sleep" (? ".exe") "] " (+ digit) "\n"))) + (with-temp-eshell + (eshell-match-command-output "*sleep 10 &" background-message) + (kill-process (caar eshell-process-list)) + (eshell-wait-for-subprocess t) + ;; Ensure we didn't emit another prompt after killing the + ;; background process. + (should (eshell-match-output background-message))))) + ;; Lisp forms |