[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108134: Mention with-demoted-errors in the doc-string of ignore-errors

[Leo Liu]

------------------------------------------------------------
revno: 108134
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-09-12 01:47:25 +0800
message:
  Mention with-demoted-errors in the doc-string of ignore-errors
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-11 07:13:21 +0000
+++ b/lisp/ChangeLog    2012-09-11 17:47:25 +0000
@@ -1,3 +1,7 @@
+2012-09-11  Leo Liu  <address@hidden>
+
+       * subr.el (ignore-errors): Mention with-demoted-errors in doc-string.
+
 2012-09-11  Glenn Morris  <address@hidden>
 
        * emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords):

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-04-27 02:24:38 +0000
+++ b/lisp/subr.el      2012-09-11 17:47:25 +0000
@@ -252,7 +252,9 @@
 
 (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)))