# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1205514529 0
# Node ID 6dea713805974df6906e03ee0dbbec47c419d17c
# Parent  43dad863df3be772bc6bbfa80f423f00a56b1a1f
(desktop-create-buffer): Don't catch errors if debug-on-error is set.

diff -r 43dad863df3b -r 6dea71380597 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Mar 14 16:49:31 2008 +0000
+++ b/lisp/ChangeLog	Fri Mar 14 17:08:49 2008 +0000
@@ -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 -r 43dad863df3b -r 6dea71380597 lisp/desktop.el
--- a/lisp/desktop.el	Fri Mar 14 16:49:31 2008 +0000
+++ b/lisp/desktop.el	Fri Mar 14 17:08:49 2008 +0000
@@ -1130,7 +1130,7 @@
     (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)