aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2004-12-30 12:25:28 +0000
committerKenichi Handa2004-12-30 12:25:28 +0000
commit7335e61a83e1b1e27d2eecf74f38e75a1674326d (patch)
tree6629168d5e1d3d1ddc8f975b23376e67094bee02 /src
parent7e2d9efd85e4db8d6a6677ac032f9abf94d545d9 (diff)
downloademacs-7335e61a83e1b1e27d2eecf74f38e75a1674326d.tar.gz
emacs-7335e61a83e1b1e27d2eecf74f38e75a1674326d.zip
(x_produce_glyphs): Calculate tab width by
FRAME_SPACE_WIDTH, not FRAME_COLUMN_WIDTH.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c6
1 files changed, 3 insertions, 3 deletions
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)
19163 } 19163 }
19164 else if (it->char_to_display == '\t') 19164 else if (it->char_to_display == '\t')
19165 { 19165 {
19166 int tab_width = it->tab_width * FRAME_COLUMN_WIDTH (it->f); 19166 int tab_width = it->tab_width * FRAME_SPACE_WIDTH (it->f);
19167 int x = it->current_x + it->continuation_lines_width; 19167 int x = it->current_x + it->continuation_lines_width;
19168 int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; 19168 int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
19169 19169
19170 /* If the distance from the current position to the next tab 19170 /* If the distance from the current position to the next tab
19171 stop is less than a canonical character width, use the 19171 stop is less than a space character width, use the
19172 tab stop after that. */ 19172 tab stop after that. */
19173 if (next_tab_x - x < FRAME_COLUMN_WIDTH (it->f)) 19173 if (next_tab_x - x < FRAME_SPACE_WIDTH (it->f))
19174 next_tab_x += tab_width; 19174 next_tab_x += tab_width;
19175 19175
19176 it->pixel_width = next_tab_x - x; 19176 it->pixel_width = next_tab_x - x;