From: Glenn Morris <rgm@gnu.org>
Date: Thu, 10 Mar 2011 07:16:04 +0000 (-0800)
Subject: * lisp/eshell/esh-util.el (eshell-condition-case): Doc fix.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~614
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2f603cc420af9f07bc9ce27b96256255009c506;p=emacs.git

* lisp/eshell/esh-util.el (eshell-condition-case): Doc fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd8bf932799..0499954465a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-10  Glenn Morris  <rgm@gnu.org>
 
+	* eshell/esh-util.el (eshell-condition-case): Doc fix.
+
 	* cus-edit.el (Custom-newline): If no button at point, look
 	for a subgroup button at start-of-line.  (Bug#2298)
 
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'."
   (memq system-type '(ms-dos windows-nt)))
 
 (defmacro eshell-condition-case (tag form &rest handlers)
-  "Like `condition-case', but only if `eshell-pass-through-errors' is nil."
+  "If `eshell-handle-errors' is non-nil, this is `condition-case'.
+Otherwise, evaluates FORM with no error handling."
   (if eshell-handle-errors
       `(condition-case ,tag
 	   ,form