diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2015-03-22 12:40:21 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2015-03-22 12:40:21 +0100 |
| commit | bb7b23c5cbd0659a9e913ea4c4642bffe83541ef (patch) | |
| tree | 18719d3ad924c25ed4358ae9a881b7dc4e6023d9 | |
| parent | ae3d7333608652cc35f1d50cac9ea90b55f12a08 (diff) | |
| download | emacs-bb7b23c5cbd0659a9e913ea4c4642bffe83541ef.tar.gz | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b28517f07ed..8f888e37b06 100644 --- 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 dc0e666836e..38befeece45 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 |