mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

In window-state-put allow WINDOW to refer to an internal window (Bug#16793).

Browse Source 
* window.el (window-state-put): Allow WINDOW to refer to an
internal window (Bug#16793).
This commit is contained in:
Martin Rudalics 2014-02-19 10:54:35 +01:00
parent 95160c901a
commit 8e009b7881
2 changed files with 25 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 @@
2014-02-19 Martin Rudalics <rudalics@gmx.at>
* window.el (window-state-put): Allow WINDOW to refer to an
internal window (Bug#16793).
2014-02-19 Glenn Morris <rgm@gnu.org>
* textmodes/remember.el: Move provide statement to end.

22
lisp/window.el
View File

@ -5026,14 +5026,32 @@ value can be also stored on disk and read back in a new session."
"Put window state STATE into WINDOW.
STATE should be the state of a window returned by an earlier
invocation of `window-state-get'. Optional argument WINDOW must
specify a live window and defaults to the selected one.
specify a valid window and defaults to the selected one. If
WINDOW is not live, replace WINDOW by a live one before putting
STATE into it.
Optional argument IGNORE non-nil means ignore minimum window
sizes and fixed size restrictions. IGNORE equal `safe' means
windows can get as small as `window-safe-min-height' and
`window-safe-min-width'."
(setq window-state-put-stale-windows nil)
(setq window (window-normalize-window window t))
(setq window (window-normalize-window window))
;; When WINDOW is internal, reduce it to a live one to put STATE into,
;; see Bug#16793.
(unless (window-live-p window)
(let ((root (frame-root-window window)))
(if (eq window root)
(setq window (frame-first-window root))
(setq root window)
(setq window (catch 'live
(walk-window-subtree
(lambda (window)
(when (window-live-p window)
(throw 'live window)))
root))))
(delete-other-windows-internal window root)))
(let* ((frame (window-frame window))
(head (car state))
;; We check here (1) whether the total sizes of root window of