2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 381a3fe7869..950d4a34b12 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-13  Martin Rudalics  <rudalics@gmx.at>
+
+        * xdisp.c (resize_mini_window): Round height to a multiple of
+        frame's line height.  Fix bug in calculation of window start
+        position (Bug#16424).
+
 2014-01-13  Jan Djärv  <jan.h.d@swipnet.se>
 
         * macfont.m: Include termchar.h.
diff --git a/src/xdisp.c b/src/xdisp.c
index 8efe3492db0..bd6630a23c3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10658,9 +10658,9 @@ resize_mini_window (struct window *w, int exact_p)
       /* Compute a suitable window start.  */
       if (height > max_height)
         {
-          height = max_height;
+          height = (max_height / unit) * unit;
           init_iterator (&it, w, ZV, ZV_BYTE, NULL, DEFAULT_FACE_ID);
-          move_it_vertically_backward (&it, height);
+          move_it_vertically_backward (&it, height - unit);
           start = it.current.pos;
         }
       else