Commit a6600376 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-24

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

Conflicts:
	lisp/ChangeLog
parents 821b6002 bb7b23c5
2015-03-23 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-23 Dmitry Gutov <dgutov@yandex.ru>
 
* json.el (json-decode-char0): Delete this alias as well.
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment