2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc1f1af853b..0117b83feb1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fresize_mini_window_internal): Set w->total_lines
+        from w->pixel_height (Bug#18422).
+
 2014-09-09  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (updateFrameSize:, initFrameFromEmacs:)
diff --git a/src/window.c b/src/window.c
index 3fefd9ce682..7e50282a39b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4804,10 +4804,10 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
       block_input ();
       window_resize_apply (r, 0);
 
-      w->total_lines = XFASTINT (w->new_total);
-      w->top_line = r->top_line + r->total_lines;
       w->pixel_height = XFASTINT (w->new_pixel);
+      w->total_lines = w->pixel_height / FRAME_LINE_HEIGHT (f);
       w->pixel_top = r->pixel_top + r->pixel_height;
+      w->top_line = r->top_line + r->total_lines;
 
       fset_redisplay (f);
       FRAME_WINDOW_SIZES_CHANGED (f) = 1;