Fix calculation of total window sizes after font size changes (Bug#19972).

* frame.c (adjust_frame_size): If the pixel sizes remain
unchanged but the number of lines or columns of the frame
changes, run `window--pixel-to-total' (Bug#19972).
(Qwindow_pixel_to_total): DEFSYM it.
* window.el (window--dump-frame): For pixel height return total
number of frame's lines.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aae09fda38f..16206e2b6e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--dump-frame): For pixel height return total
+        number of frame's lines.
+
 2015-03-03  Daniel Colascione  <dancol@dancol.org>
 
         * emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun.
diff --git a/lisp/window.el b/lisp/window.el
index abc60063ab9..cc8a7fc402f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1160,7 +1160,7 @@ dumping to it."
       (insert
        (format "frame pixel: %s x %s   cols/lines: %s x %s   units: %s x %s\n"
                (frame-pixel-width frame) (frame-pixel-height frame)
-               (frame-total-cols frame) (frame-text-lines frame) ; (frame-total-lines frame)
+               (frame-total-cols frame) (frame-total-lines frame)
                (frame-char-width frame) (frame-char-height frame))
        (format "frame text pixel: %s x %s   cols/lines: %s x %s\n"
                (frame-text-width frame) (frame-text-height frame)