aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
authorJim Porter2022-01-27 23:13:36 -0800
committerLars Ingebrigtsen2022-02-03 20:02:20 +0100
commit2e60ef696a3cf16b0eb297948e27ba0cb32a125e (patch)
treebec32b4c1c5b76e65272d22c4c1e49312e0aae79 /lisp/eshell
parentdcc97fec29785051d7d11a66beb5f44fbaae6289 (diff)
downloademacs-2e60ef696a3cf16b0eb297948e27ba0cb32a125e.tar.gz
emacs-2e60ef696a3cf16b0eb297948e27ba0cb32a125e.zip
Ensure that tailproc is set for the last process in an Eshell pipeline
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.
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/esh-cmd.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 04d65df4f33..14139896dd4 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -764,8 +764,7 @@ This macro calls itself recursively, with NOTFIRST non-nil."
764 (eshell-set-output-handle ,eshell-output-handle 764 (eshell-set-output-handle ,eshell-output-handle
765 'append nextproc) 765 'append nextproc)
766 (eshell-set-output-handle ,eshell-error-handle 766 (eshell-set-output-handle ,eshell-error-handle
767 'append nextproc) 767 'append nextproc)))
768 (setq tailproc (or tailproc nextproc))))
769 ,(let ((head (car pipeline))) 768 ,(let ((head (car pipeline)))
770 (if (memq (car head) '(let progn)) 769 (if (memq (car head) '(let progn))
771 (setq head (car (last head)))) 770 (setq head (car (last head))))
@@ -781,7 +780,9 @@ This macro calls itself recursively, with NOTFIRST non-nil."
781 ,(cond ((not notfirst) (quote 'first)) 780 ,(cond ((not notfirst) (quote 'first))
782 ((cdr pipeline) t) 781 ((cdr pipeline) t)
783 (t (quote 'last))))) 782 (t (quote 'last)))))
784 ,(car pipeline)))))) 783 (let ((proc ,(car pipeline)))
784 (setq tailproc (or tailproc proc))
785 proc))))))
785 786
786(defmacro eshell-do-pipelines-synchronously (pipeline) 787(defmacro eshell-do-pipelines-synchronously (pipeline)
787 "Execute the commands in PIPELINE in sequence synchronously. 788 "Execute the commands in PIPELINE in sequence synchronously.