diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-14 17:08:49 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-14 17:08:49 +0000 |
| commit | 116d5bc76a7c554b102813409694399765e35355 (patch) | |
| tree | aec51084588099b81d8b011b9667cff2e282606a /lisp | |
| parent | c79a07d79534a2f7c207379e0809f763e0feda6f (diff) | |
| download | emacs-116d5bc76a7c554b102813409694399765e35355.tar.gz | |
(desktop-create-buffer): Don't catch errors if debug-on-error is set.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 67ecd1ade23..93e8f80ff19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-03-14 Stefan Monnier <monnier@iro.umontreal.ca> + + * desktop.el (desktop-create-buffer): Don't catch errors if + debug-on-error is set. + 2008-03-14 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in ($(lisp)/calendar/cal-loaddefs.el) diff --git a/lisp/desktop.el b/lisp/desktop.el index d52890e2a93..d1f6d214e20 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1130,7 +1130,7 @@ directory DIRNAME." (desktop-load-file desktop-buffer-major-mode) (let ((buffer-list (buffer-list)) (result - (condition-case err + (condition-case-no-debug err (funcall (or (cdr (assq desktop-buffer-major-mode desktop-buffer-mode-handlers)) 'desktop-restore-file-buffer) |