diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-10 20:22:10 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-10 20:22:10 +0000 |
| commit | 2a3bd2e19336d9a83349575859cfb4842c2ec861 (patch) | |
| tree | 99185c9d37c39d003f8b6395e03aa9c866be64f3 /src/w32term.c | |
| parent | d5dc61631e773495e96ed2bbd3bca16c981e9f7e (diff) | |
| download | emacs-2a3bd2e19336d9a83349575859cfb4842c2ec861.tar.gz | |
* xdisp.c (underline_minimum_offset): Rename from xterm.c's
x_underline_minimum_display_offset.
(syms_of_xdisp): Declare it here rather than in xterm.c.
* dispextern.h (underline_minimum_offset): Declare it.
* w32term.c (x_draw_glyph_string): Use it.
* xterm.c (x_underline_minimum_display_offset): Move to xdisp.c.
(syms_of_xterm): Don't declare it any more.
(x_draw_glyph_string): Adjust to the new name.
* cus-start.el (underline-minimum-offset) Rename from
x-underline-minimum-display-offset.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/w32term.c b/src/w32term.c index 63d8a1518fe..7880b8abc10 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2910,6 +2910,7 @@ x_draw_glyph_string (s) else if (s->font) position = (s->font->descent + 1) / 2; } + position = max (position, underline_minimum_offset); } /* Check the sanity of thickness and position. We should avoid drawing underline out of the current line area. */ |