In `debug' don't try using window on inaccessible frame (Bug#17170).

* emacs-lisp/debug.el (debug): Don't try using "previous"
window when its not live or on an invisible frame (Bug#17170).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b28517f07edc6318d57cf338f523f8217d301409..8f888e37b06c064d2693f39c93be2dee55b0eabe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-22  Martin Rudalics  <rudalics@gmx.at>
+
+       * emacs-lisp/debug.el (debug): Don't try using "previous" window
+       when its not live or on an invisible frame (Bug#17170).
+
 2015-03-21  Mario Lang  <mlang@delysid.org>
 
        * emacs-lisp/tabulated-list.el (tabulated-list-print): Only call

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index dc0e666836e740e162351c90a1c8c099aa72d630..38befeece45e103f5f354211c26af5fc1ca2b952 100644 (file)
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -193,8 +193,10 @@ first will be printed into the backtrace buffer."
               debugger-buffer
               `((display-buffer-reuse-window
                  display-buffer-in-previous-window)
-                 . (,(when debugger-previous-window
-                       `(previous-window . ,debugger-previous-window)))))
+                . (,(when (and (window-live-p debugger-previous-window)
+                               (frame-visible-p
+                                (window-frame debugger-previous-window)))
+                      `(previous-window . ,debugger-previous-window)))))
              (setq debugger-window (selected-window))
              (if (eq debugger-previous-window debugger-window)
                  (when debugger-jumping-flag