[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111130: Don't use previous underl
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111130: Don't use previous underline thickness or position if previous underline type is underwave. |
Date: |
Fri, 04 Jan 2013 11:05:33 +0900 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111130
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: emacs-24
timestamp: Fri 2013-01-04 11:05:33 +0900
message:
Don't use previous underline thickness or position if previous underline type
is underwave.
modified:
src/ChangeLog
src/nsterm.m
src/w32term.c
src/xterm.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-01-04 01:58:07 +0000
+++ b/src/ChangeLog 2013-01-04 02:05:33 +0000
@@ -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 <address@hidden>
* keymap.c (Fkey_description): Doc fix. (Bug#13323)
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2013-01-04 01:58:07 +0000
+++ b/src/nsterm.m 2013-01-04 02:05:33 +0000
@@ -2634,6 +2634,7 @@
/* 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;
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2013-01-04 01:58:07 +0000
+++ b/src/w32term.c 2013-01-04 02:05:33 +0000
@@ -2464,7 +2464,8 @@
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;
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-01-04 01:58:07 +0000
+++ b/src/xterm.c 2013-01-04 02:05:33 +0000
@@ -2825,7 +2825,8 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111130: Don't use previous underline thickness or position if previous underline type is underwave.,
YAMAMOTO Mitsuharu <=