From d02e58f8daf5a9f3d2b7912871b57868a7ba49b7 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Wed, 12 Sep 2012 01:47:25 +0800 Subject: [PATCH] Mention with-demoted-errors in the doc-string of ignore-errors --- lisp/ChangeLog | 4 ++++ lisp/subr.el | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b448f30e5e3..4f8a0b0e01e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-09-11 Leo Liu + + * subr.el (ignore-errors): Mention with-demoted-errors in doc-string. + 2012-09-11 Glenn Morris * emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords): diff --git a/lisp/subr.el b/lisp/subr.el index 9b293bb21ac..f6be21076c9 100644 --- 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))) -- 2.39.2