procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-24

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

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Paul Eggert 2015-03-23 10:17:21 -07:00
commit a660037698
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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.

6
lisp/emacs-lisp/debug.el
View file

@ -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