[Emacs-diffs] master a660037 4/6: Merge from origin/emacs-24

[Paul Eggert]

branch: master
commit a660037698bce151915e6e084593071134df1331
Merge: 821b600 bb7b23c
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-24
    
    bb7b23c In `debug' don't try using window on inaccessible frame (Bug#17170).
    
    Conflicts:
        lisp/ChangeLog
---
 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 9448e05..712bd73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23  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-23  Dmitry Gutov  <address@hidden>
 
        * json.el (json-decode-char0): Delete this alias as well.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 8321328..ce5c786 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -192,8 +192,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