diff options
| author | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
| commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
| tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /lisp/eshell/esh-util.el | |
| parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
| parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
| download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip | |
Merge from trunk
Diffstat (limited to 'lisp/eshell/esh-util.el')
| -rw-r--r-- | lisp/eshell/esh-util.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index dbe4f824deb..424d246a2b6 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el | |||
| @@ -138,7 +138,8 @@ function `string-to-number'." | |||
| 138 | (memq system-type '(ms-dos windows-nt))) | 138 | (memq system-type '(ms-dos windows-nt))) |
| 139 | 139 | ||
| 140 | (defmacro eshell-condition-case (tag form &rest handlers) | 140 | (defmacro eshell-condition-case (tag form &rest handlers) |
| 141 | "Like `condition-case', but only if `eshell-pass-through-errors' is nil." | 141 | "If `eshell-handle-errors' is non-nil, this is `condition-case'. |
| 142 | Otherwise, evaluates FORM with no error handling." | ||
| 142 | (if eshell-handle-errors | 143 | (if eshell-handle-errors |
| 143 | `(condition-case ,tag | 144 | `(condition-case ,tag |
| 144 | ,form | 145 | ,form |