(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 d2f6b2234c704269db3a50092660684dfd4c95c8..faa0dfc21231dcbca7ba9c28edb475bf094c441e 100644 (file)
--- 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;