aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2014-01-13 12:30:30 +0100
committerMartin Rudalics2014-01-13 12:30:30 +0100
commita3f2bf1b86895ef5ab609abd789c70b3d59b49be (patch)
tree71bd5f47b575f1fd625aac17aa99051327d5242e /src
parentd791cc3bc2781435f7b54fb9b45c690c7e4e0ee6 (diff)
downloademacs-a3f2bf1b86895ef5ab609abd789c70b3d59b49be.tar.gz
emacs-a3f2bf1b86895ef5ab609abd789c70b3d59b49be.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c4
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 @@
12014-01-13 Martin Rudalics <rudalics@gmx.at>
2
3 * xdisp.c (resize_mini_window): Round height to a multiple of
4 frame's line height. Fix bug in calculation of window start
5 position (Bug#16424).
6
12014-01-13 Jan Djärv <jan.h.d@swipnet.se> 72014-01-13 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * macfont.m: Include termchar.h. 9 * 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)
10658 /* Compute a suitable window start. */ 10658 /* Compute a suitable window start. */
10659 if (height > max_height) 10659 if (height > max_height)
10660 { 10660 {
10661 height = max_height; 10661 height = (max_height / unit) * unit;
10662 init_iterator (&it, w, ZV, ZV_BYTE, NULL, DEFAULT_FACE_ID); 10662 init_iterator (&it, w, ZV, ZV_BYTE, NULL, DEFAULT_FACE_ID);
10663 move_it_vertically_backward (&it, height); 10663 move_it_vertically_backward (&it, height - unit);
10664 start = it.current.pos; 10664 start = it.current.pos;
10665 } 10665 }
10666 else 10666 else