aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoam Postavsky2018-09-19 18:57:37 -0400
committerNoam Postavsky2018-09-19 18:57:37 -0400
commitb3baf997c8e9bbff351e0bf24b8fdae8831ec1df (patch)
treeb51bd8032538f505ccb4942e91855598e38c057b
parent98544ea3ea1638228db48c5ff993caded470d9c1 (diff)
downloademacs-b3baf997c8e9bbff351e0bf24b8fdae8831ec1df.tar.gz
emacs-b3baf997c8e9bbff351e0bf24b8fdae8831ec1df.zip
Document synchronous behavior of eshell/make (Bug#32513)
* doc/misc/eshell.texi (Built-ins): * lisp/eshell/em-unix.el (eshell/make): Mention that it falls back to the external 'make' command when called synchronously.
-rw-r--r--doc/misc/eshell.texi5
-rw-r--r--lisp/eshell/em-unix.el3
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 951a28f4829..b0d5603e0c9 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -346,8 +346,9 @@ Alias to Emacs's @code{locate} function, which simply runs the external
346 346
347@item make 347@item make
348@cmindex make 348@cmindex make
349Run @command{make} through @code{compile}. 349Run @command{make} through @code{compile} when run asynchronously
350@xref{Compilation, , , emacs, The GNU Emacs Manual}. 350(e.g., @samp{make &}). @xref{Compilation, , , emacs, The GNU Emacs
351Manual}. Otherwise call the external @command{make} command.
351 352
352@item occur 353@item occur
353@cmindex occur 354@cmindex occur
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index b00b6654cc5..b569f909938 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -656,7 +656,8 @@ Concatenate FILE(s), or standard input, to standard output.")
656;; special front-end functions for compilation-mode buffers 656;; special front-end functions for compilation-mode buffers
657 657
658(defun eshell/make (&rest args) 658(defun eshell/make (&rest args)
659 "Use `compile' to do background makes." 659 "Use `compile' to do background makes.
660Fallback to standard make when called synchronously."
660 (if (and eshell-current-subjob-p 661 (if (and eshell-current-subjob-p
661 (eshell-interactive-output-p)) 662 (eshell-interactive-output-p))
662 (let ((compilation-process-setup-function 663 (let ((compilation-process-setup-function