[Emacs-diffs] emacs-26 b3baf99 2/2: Document synchronous behavior of eshell/make (Bug#32513)

[Noam Postavsky]

branch: emacs-26
commit b3baf997c8e9bbff351e0bf24b8fdae8831ec1df
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>

    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.
---
 doc/misc/eshell.texi   | 5 +++--
 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 951a28f..b0d5603 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}.
address@hidden, , , 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 b00b665..b569f90 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