diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2014-09-11 10:47:34 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2014-09-11 10:47:34 +0200 |
| commit | 6e49a66ad282cd8416d6d8ed2646fb9dd7f41bd4 (patch) | |
| tree | 62edfda583efbaf83cff66e6b6bf7ffed43ae28d | |
| parent | 2776a6502b211c45e6b4e65549436d2d8527b6f3 (diff) | |
| download | emacs-6e49a66ad282cd8416d6d8ed2646fb9dd7f41bd4.tar.gz | |
In Fresize_mini_window_internal set w->total_lines from w->pixel_height (Bug#18422).
* window.c (Fresize_mini_window_internal): Set w->total_lines
from w->pixel_height (Bug#18422).
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 4 |
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; |