mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Make `eshell-command' also work when asynchronous

Browse source 
* lisp/eshell/esh-cmd.el (eshell-eval-command): Make asynchronous
`eshell-command' work (e.g. `M-x eshell-command RET sleep 10 &')
(bug#50209).
This commit is contained in:
Thierry Volpiatto 2021-08-27 17:01:21 +02:00 • committed by Lars Ingebrigtsen
parent 0d45ad99da
commit d0693617b8
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lisp/eshell/esh-cmd.el
View file

@ -923,10 +923,10 @@ at the moment are:
(defun eshell-eval-command (command &optional input)
"Evaluate the given COMMAND iteratively."
(if eshell-current-command
;; we can just stick the new command at the end of the current
;; one, and everything will happen as it should
;; We can just stick the new command at the end of the current
;; one, and everything will happen as it should.
(setcdr (last (cdr eshell-current-command))
(list `(let ((here (and (eobp) (point))))
(list `(let ((here (and (eobp) (point))))
,(and input
`(insert-and-inherit ,(concat input "\n")))
(if here
@ -937,14 +937,20 @@ at the moment are:
(erase-buffer)
(insert "command: \"" input "\"\n")))
(setq eshell-current-command command)
(let ((delim (catch 'eshell-incomplete
(eshell-resume-eval))))
;; On systems that don't support async subprocesses, eshell-resume
;; can return t. Don't treat that as an error.
(if (listp delim)
(setq delim (car delim)))
(if (and delim (not (eq delim t)))
(error "Unmatched delimiter: %c" delim)))))
(let* ((delim (catch 'eshell-incomplete
(eshell-resume-eval)))
(val (car-safe delim)))
;; If the return value of `eshell-resume-eval' is wrapped in a
;; list, it indicates that the command was run asynchronously.
;; In that case, unwrap the value before checking the delimiter
;; value.
(if (and val
(not (processp val))
(not (eq val t)))
(error "Unmatched delimiter: %S" val)
;; Eshell-command expect a list like (<process>) to know if the
;; command should be async or not.
(or (and (processp val) delim) val)))))
(defun eshell-resume-command (proc status)
"Resume the current command when a process ends."