(desktop-create-buffer): Don't catch errors if debug-on-error is set.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67ecd1ade23732a3faaf2b8111d542f4bd88ff14..93e8f80ff19fefc237577e08b01945d61d3ab4c1 100644 (file)
--- 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 d52890e2a9344f86b6f46bb502239987077c3691..d1f6d214e20241516b0aa9fd157a3e2864336303 100644 (file)
--- 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)