aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorAndreas Schwab2010-08-11 15:43:49 +0200
committerAndreas Schwab2010-08-11 15:43:49 +0200
commit7467d0a812ca803105e6d28dbb75c7246521e862 (patch)
tree1a07b6f727e0ba409dcfa4ef7b5ab99d9701b151 /lisp
parent2294b255d8e8e4e4a8ea66698dbae23c296f19a8 (diff)
downloademacs-7467d0a812ca803105e6d28dbb75c7246521e862.tar.gz
emacs-7467d0a812ca803105e6d28dbb75c7246521e862.zip
* subr.el (ignore-errors): Add debug declaration.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bdb6535045..0ae95366b6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-08-11 Andreas Schwab <schwab@linux-m68k.org>
2
3 * subr.el (ignore-errors): Add debug declaration.
4
12010-08-09 Geoff Gole <geoffgole@gmail.com> (tiny change) 52010-08-09 Geoff Gole <geoffgole@gmail.com> (tiny change)
2 6
3 * whitespace.el (whitespace-color-off): Remove post-command-hook 7 * whitespace.el (whitespace-color-off): Remove post-command-hook
diff --git a/lisp/subr.el b/lisp/subr.el
index 16ea5b41342..44ae84ab76b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -219,6 +219,7 @@ Treated as a declaration when used at the right place in a
219(defmacro ignore-errors (&rest body) 219(defmacro ignore-errors (&rest body)
220 "Execute BODY; if an error occurs, return nil. 220 "Execute BODY; if an error occurs, return nil.
221Otherwise, return result of last form in BODY." 221Otherwise, return result of last form in BODY."
222 (declare (debug t) (indent 0))
222 `(condition-case nil (progn ,@body) (error nil))) 223 `(condition-case nil (progn ,@body) (error nil)))
223 224
224;;;; Basic Lisp functions. 225;;;; Basic Lisp functions.