Merge from origin/emacs-25

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index 3a0532a693b0047910289cef8f78fa183380e39c..9cf12f1a9959ef12be5266d34cfab2f96013cf90 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -321,9 +321,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, int margin)
       int width = w->total_cols;
       double d = max (0, margin);
       d = min (width / 2 - 1, d);
-      /* Since MARGIN is positive, we cannot possibly have less than
-        one glyph for the marginal area.  */
-      return max (1, (int) ((double) total_glyphs / width * d));
+      return (int) ((double) total_glyphs / width * d);
     }
   return 0;
 }