diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-09-19 18:57:37 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-09-19 18:57:37 -0400 |
| commit | b3baf997c8e9bbff351e0bf24b8fdae8831ec1df (patch) | |
| tree | b51bd8032538f505ccb4942e91855598e38c057b | |
| parent | 98544ea3ea1638228db48c5ff993caded470d9c1 (diff) | |
| download | emacs-b3baf997c8e9bbff351e0bf24b8fdae8831ec1df.tar.gz | |
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.texi | 5 | ||||
| -rw-r--r-- | lisp/eshell/em-unix.el | 3 |
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 @item make @cmindex make -Run @command{make} through @code{compile}. -@xref{Compilation, , , emacs, The GNU Emacs Manual}. +Run @command{make} through @code{compile} when run asynchronously +(e.g., @samp{make &}). @xref{Compilation, , , emacs, The GNU Emacs +Manual}. Otherwise call the external @command{make} command. @item occur @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.") ;; special front-end functions for compilation-mode buffers (defun eshell/make (&rest args) - "Use `compile' to do background makes." + "Use `compile' to do background makes. +Fallback to standard make when called synchronously." (if (and eshell-current-subjob-p (eshell-interactive-output-p)) (let ((compilation-process-setup-function |