diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:17:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:17:21 -0700 |
| commit | a660037698bce151915e6e084593071134df1331 (patch) | |
| tree | 789eea5ae877ce84973daefbb1a7d9256297c75e /lisp/emacs-lisp/debug.el | |
| parent | 821b6002127fba1e5b57d39e63eabd0ae189f6af (diff) | |
| parent | bb7b23c5cbd0659a9e913ea4c4642bffe83541ef (diff) | |
| download | emacs-a660037698bce151915e6e084593071134df1331.tar.gz emacs-a660037698bce151915e6e084593071134df1331.tar.bz2 emacs-a660037698bce151915e6e084593071134df1331.zip | |
Merge from origin/emacs-24
bb7b23c In `debug' don't try using window on inaccessible frame (Bug#17170).
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'lisp/emacs-lisp/debug.el')
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 83213285d4e..ce5c7863c3c 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 |