summaryrefslogtreecommitdiff
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-09-21 11:03:48 +0800
committerChong Yidong <cyd@gnu.org>2012-09-21 11:03:48 +0800
commitacfa068f4a1a4652b784af1d7aaac92929399249 (patch)
tree4d5aef916164ae9862e4c94f50a5e53bbe274e53 /lisp/subr.el
parenteb2deaffd17e760b3ec945c58d43080e8a44767a (diff)
parentd3fa327c47570a1767324d23d710504e90b083f9 (diff)
downloademacs-acfa068f4a1a4652b784af1d7aaac92929399249.tar.gz
Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index e9b85ff1f38..13516419b6f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -280,7 +280,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)))