mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-28 01:00:52 -07:00
Code Issues Projects Releases Wiki Activity

Don't use previous underline thickness or position if previous underline type is underwave.

Browse source
This commit is contained in:
YAMAMOTO Mitsuharu 2013-01-04 11:05:33 +09:00
parent f032a31830
commit 4240dd3cef
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -5,6 +5,11 @@
* xterm.c (x_draw_underwave): Make underwave look more triangular
and also degrade gracefully for small fonts. (Bug#13000)
* nsterm.m (ns_draw_text_decoration):
* w32term.c (x_draw_glyph_string):
* xterm.c (x_draw_glyph_string): Don't use previous underline
thickness and position if previous underline type is underwave.
2012-12-31 Glenn Morris <rgm@gnu.org>
* keymap.c (Fkey_description): Doc fix. (Bug#13323)

1
src/nsterm.m
View file

@ -2634,6 +2634,7 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
/* If the prev was underlined, match its appearance. */
if (s->prev && s->prev->face->underline_p
&& s->prev->face->underline_type == FACE_UNDER_LINE
&& s->prev->underline_thickness > 0)
{
thickness = s->prev->underline_thickness;

3
src/w32term.c
View file

@ -2464,7 +2464,8 @@ x_draw_glyph_string (struct glyph_string *s)
unsigned long thickness, position;
int y;
if (s->prev && s->prev->face->underline_p)
if (s->prev && s->prev->face->underline_p
&& s->prev->face->underline_type == FACE_UNDER_LINE)
{
/* We use the same underline style as the previous one. */
thickness = s->prev->underline_thickness;

3
src/xterm.c
View file

@ -2825,7 +2825,8 @@ x_draw_glyph_string (struct glyph_string *s)
unsigned long thickness, position;
int y;
if (s->prev && s->prev->face->underline_p)
if (s->prev && s->prev->face->underline_p
&& s->prev->face->underline_type == FACE_UNDER_LINE)
{
/* We use the same underline style as the previous one. */
thickness = s->prev->underline_thickness;