From bc7f1625f6a06f153feb4253684a41ae2d96fb36 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 27 Jul 2014 16:01:07 +0300 Subject: [PATCH] Fix bugs #16674 and #18112 with resizing TTY frames after switching terminals. lisp/window.el (window--pixel-to-total): Use FRAME's root window, not that of the selected frame. --- lisp/ChangeLog | 5 +++++ lisp/window.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5307a6a496f..fe7dec98983 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-27 Eli Zaretskii + + * window.el (window--pixel-to-total): Use FRAME's root window, not + that of the selected frame. (Bug#18112, Bug#16674) + 2014-07-27 Andreas Schwab * textmodes/tex-mode.el (tex-font-lock-verb): Doc fix. diff --git a/lisp/window.el b/lisp/window.el index 28dd6a8ab26..c771f01707e 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -2230,7 +2230,7 @@ Optional argument HORIZONTAL non-nil means assign new total window widths from pixel widths." (setq frame (window-normalize-frame frame)) (let* ((char-size (frame-char-size frame horizontal)) - (root (frame-root-window)) + (root (frame-root-window frame)) (root-size (window-size root horizontal t)) ;; We have to care about the minibuffer window only if it ;; appears together with the root window on this frame. -- 2.11.4.GIT