2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24252af8386..b6f925e27cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-28  Richard Stallman  <rms@gnu.org>
+
+        * emacs-lisp/edebug.el (edebug-display): Don't go to
+        edebug-outside-buffer if it is dead.
+
 2007-03-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * view.el (view-mode): Fix typos in docstring.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 2777ea775e9..151bbd2bd9e 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2755,7 +2755,8 @@ MSG is printed after `::::} '."
               )                         ; if edebug-save-windows
 
             ;; Restore current buffer always, in case application needs it.
-            (set-buffer edebug-outside-buffer)
+            (if (buffer-name edebug-outside-buffer)
+                (set-buffer edebug-outside-buffer))
             ;; Restore point, and mark.
             ;; Needed even if restoring windows because
             ;; that doesn't restore point and mark in the current buffer.