[Emacs-diffs] emacs-24 bb7b23c: In `debug' don't try using window on inaccessible frame (Bug#17170).

[Martin Rudalics]

branch: emacs-24
commit bb7b23c5cbd0659a9e913ea4c4642bffe83541ef
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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).
---
 lisp/ChangeLog           |    5 +++++
 lisp/emacs-lisp/debug.el |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b28517f..8f888e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-22  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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 dc0e666..38befee 100644
--- 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