From: Kim F. Storm <storm@cua.dk>
Date: Sun, 31 Oct 2004 00:05:18 +0000 (+0000)
Subject: (margin_glyphs_to_reserve): Don't use ncols_scale_factor.
X-Git-Tag: ttn-vms-21-2-B4~4308
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35ec832e6396e6c80aaa7954dacf1adfdb3a818a;p=emacs.git

(margin_glyphs_to_reserve): Don't use ncols_scale_factor.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 903bdaabf3b..69e495d8d8b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -579,7 +579,7 @@ margin_glyphs_to_reserve (w, total_glyphs, margin)
       int width = XFASTINT (w->total_cols);
       double d = max (0, XFLOATINT (margin));
       d = min (width / 2 - 1, d);
-      n = (int) ((double) total_glyphs / width * d) * w->ncols_scale_factor;
+      n = (int) ((double) total_glyphs / width * d);
     }
   else
     n = 0;