Mercurial > emacs
changeset 95611:4ad2aacd19df
Calculate tab width based on current face, not global default
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1217
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 06 Jun 2008 23:07:50 +0000 |
| parents | cb95dadcb2de |
| children | 26c59cfcaeff |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jun 06 22:53:14 2008 +0000 +++ b/src/ChangeLog Fri Jun 06 23:07:50 2008 +0000 @@ -1,3 +1,8 @@ +2008-06-06 Miles Bader <miles@gnu.org> + + * xdisp.c (x_produce_glyphs): Calculate tab width based on current + face, not frame default. + 2008-06-05 Martin Rudalics <rudalics@gmx.at> * window.c (pop_up_windows, pop_up_frames)
--- a/src/xdisp.c Fri Jun 06 22:53:14 2008 +0000 +++ b/src/xdisp.c Fri Jun 06 23:07:50 2008 +0000 @@ -20980,14 +20980,14 @@ } else if (it->char_to_display == '\t') { - int tab_width = it->tab_width * FRAME_SPACE_WIDTH (it->f); + int tab_width = it->tab_width * font->space_width; 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 space character width, use the tab stop after that. */ - if (next_tab_x - x < FRAME_SPACE_WIDTH (it->f)) + if (next_tab_x - x < font->space_width) next_tab_x += tab_width; it->pixel_width = next_tab_x - x;