Mention with-demoted-errors in the doc-string of ignore-errors

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b448f30e5e310ee57cdc65474ae6c24729f50549..4f8a0b0e01e67580429ab1e6838601e84924152e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-11  Leo Liu  <sdl.web@gmail.com>
+
+       * subr.el (ignore-errors): Mention with-demoted-errors in doc-string.
+
 2012-09-11  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords):

diff --git a/lisp/subr.el b/lisp/subr.el
index 9b293bb21ac6da3e0cb876c584e25fc6111a2bce..f6be21076c97f1ef646ee548e0e0002f3331244a 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -252,7 +252,9 @@ Treated as a declaration when used at the right place in a
 
 (defmacro ignore-errors (&rest body)
   "Execute BODY; if an error occurs, return nil.
-Otherwise, return result of last form in BODY."
+Otherwise, return result of last form in BODY.
+See also `with-demoted-errors' that does something similar
+without silencing all errors."
   (declare (debug t) (indent 0))
   `(condition-case nil (progn ,@body) (error nil)))
 \f