3 files changed, 13 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 22830f49fb8..29b6078b037 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,14 @@
+2014-03-05  Martin Rudalics  <rudalics@gmx.at>
+
+        * dispnew.c (change_frame_size_1): Add new_lines instead of
+        new_height, the latter may be still zero if passed as such.
+        * window.c (Fwindow_pixel_height): Mention bottom divider in
+        doc-string.
+
 2014-03-05  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix "resource temporarily unavailable" with xgselect (Bug#16925).
+        Fix "resource temporarily unavailable" with xgselect
+        (Bug#16925).
         * xgselect.c: Include <stdbool.h>.
         (xg_select) [!USE_GTK]: Don't lose track of errno.
 
diff --git a/src/dispnew.c b/src/dispnew.c
index e11d143d0b5..7833f8e8af5 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5539,7 +5539,7 @@ change_frame_size_1 (struct frame *f, int new_width, int new_height,
       /* MSDOS frames cannot PRETEND, as they change frame size by
          manipulating video hardware.  */
       if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
-        FrameRows (FRAME_TTY (f)) = new_height;
+        FrameRows (FRAME_TTY (f)) = new_lines;
     }
 
   if (new_text_width != FRAME_TEXT_WIDTH (f)
diff --git a/src/window.c b/src/window.c
index 09280d206c3..b6cfacd9aad 100644
--- a/src/window.c
+++ b/src/window.c
@@ -699,9 +699,9 @@ DEFUN ("window-pixel-height", Fwindow_pixel_height, Swindow_pixel_height, 0, 1,
        doc: /* Return the height of window WINDOW in pixels.
 WINDOW must be a valid window and defaults to the selected one.
 
-The return value includes the mode line and header line, if any.  If
-WINDOW is an internal window, its pixel height is the height of the
-screen areas spanned by its children.  */)
+The return value includes the mode line and header line and the bottom
+divider, if any.  If WINDOW is an internal window, its pixel height is
+the height of the screen areas spanned by its children.  */)
   (Lisp_Object window)
 {
   return make_number (decode_valid_window (window)->pixel_height);