[Emacs-diffs] trunk r115823: Fix last change of grow_mini_window.

[Martin Rudalics]

------------------------------------------------------------
revno: 115823
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-31 20:06:18 +0100
message:
  Fix last change of grow_mini_window.
  
  * window.c (grow_mini_window): Fix last change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-31 18:30:18 +0000
+++ b/src/ChangeLog     2013-12-31 19:06:18 +0000
@@ -1,3 +1,7 @@
+2013-12-31  Martin Rudalics  <address@hidden>
+
+       * window.c (grow_mini_window): Fix last change.
+
 2013-12-31  Jan Djärv  <address@hidden>
 
        * nsterm.m (windowDidResignKey:): Set mouse_moved to 0 (Bug#8421).

=== modified file 'src/window.c'
--- a/src/window.c      2013-12-31 09:48:54 +0000
+++ b/src/window.c      2013-12-31 19:06:18 +0000
@@ -4582,24 +4582,24 @@
 
          if (pixelwise)
            {
-             pixel_height = max (min (-XINT (height), INT_MAX - 
w->pixel_height),
-                                 FRAME_LINE_HEIGHT (f));
+             pixel_height = min (-XINT (height), INT_MAX - w->pixel_height);
              line_height = pixel_height / FRAME_LINE_HEIGHT (f);
            }
          else
            {
-             line_height = max (min (-XINT (height),
-                                     ((INT_MAX - w->pixel_height)
-                                      / FRAME_LINE_HEIGHT (f))),
-                                1);
+             line_height = min (-XINT (height),
+                                ((INT_MAX - w->pixel_height)
+                                 / FRAME_LINE_HEIGHT (f)));
              pixel_height = line_height * FRAME_LINE_HEIGHT (f);
            }
 
          /* Grow the mini-window.  */
          w->pixel_top = r->pixel_top + r->pixel_height;
          w->top_line = r->top_line + r->total_lines;
-         w->pixel_height += pixel_height;
-         w->total_lines += line_height;
+         /* Make sure the mini-window has always at least one line.  */
+         w->pixel_height = max (w->pixel_height + pixel_height,
+                                FRAME_LINE_HEIGHT (f));
+         w->total_lines = max (w->total_lines + line_height, 1);
 
          /* Enforce full redisplay of the frame.  */
          /* FIXME: Shouldn't window--resize-root-window-vertically do it?  */