[Emacs-diffs] emacs-24 r117493: In Fresize_mini_window_internal set w->total_lines from w->pixel_height (Bug#18422).

[Martin Rudalics]

------------------------------------------------------------
revno: 117493
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-09-11 10:47:34 +0200
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-09 17:46:28 +0000
+++ b/src/ChangeLog     2014-09-11 08:47:34 +0000
@@ -1,3 +1,8 @@
+2014-09-11  Martin Rudalics  <address@hidden>
+
+       * window.c (Fresize_mini_window_internal): Set w->total_lines
+       from w->pixel_height (Bug#18422).
+
 2014-09-09  Jan Djärv  <address@hidden>
 
        * nsterm.m (updateFrameSize:, initFrameFromEmacs:)

=== modified file 'src/window.c'
--- a/src/window.c      2014-08-09 11:12:45 +0000
+++ b/src/window.c      2014-09-11 08:47:34 +0000
@@ -4804,10 +4804,10 @@
       block_input ();
       window_resize_apply (r, 0);
 
-      w->total_lines = XFASTINT (w->new_total);
+      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;
-      w->pixel_height = XFASTINT (w->new_pixel);
-      w->pixel_top = r->pixel_top + r->pixel_height;
 
       fset_redisplay (f);
       FRAME_WINDOW_SIZES_CHANGED (f) = 1;