From: Kenichi Handa <handa@m17n.org>
Date: Thu, 30 Dec 2004 12:25:28 +0000 (+0000)
Subject: (x_produce_glyphs): Calculate tab width by
X-Git-Tag: ttn-vms-21-2-B4~3056
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7335e61a83e1b1e27d2eecf74f38e75a1674326d;p=emacs.git

(x_produce_glyphs): Calculate tab width by
FRAME_SPACE_WIDTH, not FRAME_COLUMN_WIDTH.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index d2f6b2234c7..faa0dfc2123 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19163,14 +19163,14 @@ x_produce_glyphs (it)
 	}
       else if (it->char_to_display == '\t')
 	{
-	  int tab_width = it->tab_width * FRAME_COLUMN_WIDTH (it->f);
+	  int tab_width = it->tab_width * FRAME_SPACE_WIDTH (it->f);
 	  int x = it->current_x + it->continuation_lines_width;
 	  int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
 
 	  /* If the distance from the current position to the next tab
-	     stop is less than a canonical character width, use the
+	     stop is less than a space character width, use the
 	     tab stop after that.  */
-	  if (next_tab_x - x < FRAME_COLUMN_WIDTH (it->f))
+	  if (next_tab_x - x < FRAME_SPACE_WIDTH (it->f))
 	    next_tab_x += tab_width;
 
 	  it->pixel_width = next_tab_x - x;