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

Ensure that tailproc is set for the last process in an Eshell pipeline

Browse source 
In particular, this used to fail for pipelines where the last process
in the pipeline came from the first element of the pipeline. This
could happen when a process was piped to an ordinary Lisp function,
like in '*echo hi | echo bye'.

* lisp/eshell/esh-cmd.el (eshell-do-pipelines): Set the tailproc even
for the first process in the pipeline.

* test/lisp/eshell/eshell-tests.el (eshell-test/pipe-tailproc): New
test.
This commit is contained in:
Jim Porter 2022-01-27 23:13:36 -08:00 • committed by Lars Ingebrigtsen
parent dcc97fec29
commit 2e60ef696a
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -764,8 +764,7 @@ This macro calls itself recursively, with NOTFIRST non-nil."
(eshell-set-output-handle ,eshell-output-handle
'append nextproc)
(eshell-set-output-handle ,eshell-error-handle
'append nextproc)
(setq tailproc (or tailproc nextproc))))
'append nextproc)))
,(let ((head (car pipeline)))
(if (memq (car head) '(let progn))
(setq head (car (last head))))
@ -781,7 +780,9 @@ This macro calls itself recursively, with NOTFIRST non-nil."
,(cond ((not notfirst) (quote 'first))
((cdr pipeline) t)
(t (quote 'last)))))
,(car pipeline))))))
(let ((proc ,(car pipeline)))
(setq tailproc (or tailproc proc))
proc))))))
(defmacro eshell-do-pipelines-synchronously (pipeline)
"Execute the commands in PIPELINE in sequence synchronously.

7
test/lisp/eshell/eshell-tests.el
View file

@ -129,6 +129,13 @@ e.g. \"{(+ 1 2)} 3\" => 3"
(eshell-command-result-p "echo ${echo hi}-${*echo there}"
"hi-there\n")))
(ert-deftest eshell-test/pipe-tailproc ()
"Check that piping a process to a non-process command waits for the process"
(skip-unless (executable-find "echo"))
(with-temp-eshell
(eshell-command-result-p "*echo hi | echo bye"
"bye\nhi\n")))
(ert-deftest eshell-test/window-height ()
"$LINES should equal (window-height)"
(should (eshell-test-command-result "= $LINES (window-height)")))