diff options
| author | Kenichi Handa | 2010-08-13 15:35:36 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-08-13 15:35:36 +0900 |
| commit | e9752b399207f8087e354a599cbf469769950503 (patch) | |
| tree | b7f5cc73dc02e2268772db5050456486e5957d35 /lisp | |
| parent | ac14bd09e395f8ba25ef793d15251d4655fd173a (diff) | |
| parent | 7467d0a812ca803105e6d28dbb75c7246521e862 (diff) | |
| download | emacs-e9752b399207f8087e354a599cbf469769950503.tar.gz emacs-e9752b399207f8087e354a599cbf469769950503.zip | |
merge emacs-23
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 1 |
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 @@ | |||
| 1 | 2010-08-11 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * subr.el (ignore-errors): Add debug declaration. | ||
| 4 | |||
| 1 | 2010-08-09 Geoff Gole <geoffgole@gmail.com> (tiny change) | 5 | 2010-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. |
| 221 | Otherwise, return result of last form in BODY." | 221 | Otherwise, 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. |