Fix bug when resizing mini window (Bug#16424).

* 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).

diff --git a/src/ChangeLog b/src/ChangeLog
index 381a3fe78698c5190ff0a5121b890a97e00e1c84..950d4a34b12567d3bdf866922e1845b7cfc95651 100644 (file)
--- 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 8efe3492db08d5e9c9e461ecdf73db76adcc05aa..bd6630a23c3c680d55cd68fc04e0dd11792a6c61 100644 (file)
--- 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