summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge D. Plymale II <georgedp@orbitalimpact.com>2017-04-20 14:05:11 -0400
committerNoam Postavsky <npostavs@gmail.com>2017-04-20 23:03:10 -0400
commite8875bcbe067ea020dba95530ec4e9485942babd (patch)
treea52161f7387a57035a231d0d0624eac14550baf9
parenta6b375ba4bfc9453abc428dcb73e65bfcf61b794 (diff)
downloademacs-e8875bcbe067ea020dba95530ec4e9485942babd.tar.gz
Treat non-erroring lisp call as successful eshell command (Bug#26161)
This lets a compound command like 'cd .. && echo ok' print 'ok', similar to how most other shells behave. * lisp/eshell/esh-cmd.el (eshell-exit-success-p): Only check if the last exit code was zero, rather than first checking whether the last command returned nil. (eshell-exec-lisp): Set `eshell-last-command-status' to 1 on error. Copyright-paperwork-exempt: yes
-rw-r--r--lisp/eshell/esh-cmd.el12
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 583ba6ac42f..86e7b83c281 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -575,14 +575,9 @@ must be implemented via rewriting, rather than as a function."
(defvar eshell-last-command-result) ;Defined in esh-io.el.
(defun eshell-exit-success-p ()
- "Return non-nil if the last command was \"successful\".
-For a bit of Lisp code, this means a return value of non-nil.
-For an external command, it means an exit code of 0."
- (if (save-match-data
- (string-match "#<\\(Lisp object\\|function .*\\)>"
- eshell-last-command-name))
- eshell-last-command-result
- (= eshell-last-command-status 0)))
+ "Return non-nil if the last command was successful.
+This means an exit code of 0."
+ (= eshell-last-command-status 0))
(defvar eshell--cmd)
@@ -1257,6 +1252,7 @@ represent a lisp form; ARGS will be ignored in that case."
(and result (funcall printer result))
result)
(error
+ (setq eshell-last-command-status 1)
(let ((msg (error-message-string err)))
(if (and (not form-p)
(string-match "^Wrong number of arguments" msg)