merge trunk

1 files changed, 6 insertions, 4 deletions

diff --git a/src/window.c b/src/window.c
index 9bc95224f7c..1e3d70fd88d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4582,14 +4582,16 @@ grow_mini_window (struct window *w, int delta, bool pixelwise)
 
           if (pixelwise)
             {
-              pixel_height = min (-XINT (height), INT_MAX - w->pixel_height);
+              pixel_height = max (min (-XINT (height), INT_MAX - w->pixel_height),
+                                  FRAME_LINE_HEIGHT (f));
               line_height = pixel_height / FRAME_LINE_HEIGHT (f);
             }
           else
             {
-              line_height = min (-XINT (height),
-                                 ((INT_MAX - w->pixel_height)
-                                  / FRAME_LINE_HEIGHT (f)));
+              line_height = max (min (-XINT (height),
+                                      ((INT_MAX - w->pixel_height)
+                                       / FRAME_LINE_HEIGHT (f))),
+                                 1);
               pixel_height = line_height * FRAME_LINE_HEIGHT (f);
             }