From: Jim Porter <jporterbugs@gmail.com>
Date: Fri, 26 Jan 2024 01:12:28 +0000 (-0800)
Subject: ; For compatibility, eshell/make should print to Eshell unless backgrounded
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26d2714699059117c9031f647aec8964552aa101;p=emacs.git

; For compatibility, eshell/make should print to Eshell unless backgrounded

* lisp/eshell/em-unix.el (eshell/make): Pass 'plain' to eshell-compile
when in the foreground (bug#68724).

(cherry picked from commit 4834be0949e13a728b69ab97ac9c8a0dbec65f3a)
---

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 75afaf1c104..b066e9eeb8e 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -741,7 +741,7 @@ Fallback to standard make when called synchronously."
   (eshell-compile "make" args
                   ;; Use plain output unless we're executing in the
                   ;; background.
-                  (not eshell-current-subjob-p)))
+                  (unless eshell-current-subjob-p 'plain)))
 
 (put 'eshell/make 'eshell-no-numeric-conversions t)