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)