diff options
| author | Richard M. Stallman | 2007-08-27 03:54:16 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2007-08-27 03:54:16 +0000 |
| commit | a13ab63fff728bd2661bd08db23af7adb3228f3c (patch) | |
| tree | 0f6f76c9188645217746ca00eee884e53a8cad79 /src | |
| parent | c997bb25d732ebe0bbe9078fdcf3b564b3f73f7b (diff) | |
| download | emacs-a13ab63fff728bd2661bd08db23af7adb3228f3c.tar.gz emacs-a13ab63fff728bd2661bd08db23af7adb3228f3c.zip | |
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
and LFACE_BACKGROUND_INDEX in incorrectly copied code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bf4629774e4..73a906bcc56 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2007-08-27 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * eval.c (condition-case): Doc fix. | ||
| 4 | |||
| 5 | 2007-08-27 Masatake YAMATO <jet@gyve.org> | ||
| 6 | |||
| 7 | * xfaces.c (tty_supports_face_attributes_p): Fix code | ||
| 8 | for LFACE_INVERSE_INDEX and LFACE_BACKGROUND_INDEX; code | ||
| 9 | was copied and not edited. | ||
| 10 | |||
| 1 | 2007-08-23 Stefan Monnier <monnier@iro.umontreal.ca> | 11 | 2007-08-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 12 | ||
| 3 | * lread.c (load_warn_old_style_backquotes): Fix up array size typo. | 13 | * lread.c (load_warn_old_style_backquotes): Fix up array size typo. |
diff --git a/src/xfaces.c b/src/xfaces.c index 31e033736f6..26c98c41652 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -6064,7 +6064,7 @@ tty_supports_face_attributes_p (f, attrs, def_face) | |||
| 6064 | val = attrs[LFACE_INVERSE_INDEX]; | 6064 | val = attrs[LFACE_INVERSE_INDEX]; |
| 6065 | if (!UNSPECIFIEDP (val)) | 6065 | if (!UNSPECIFIEDP (val)) |
| 6066 | { | 6066 | { |
| 6067 | if (face_attr_equal_p (val, def_attrs[LFACE_UNDERLINE_INDEX])) | 6067 | if (face_attr_equal_p (val, def_attrs[LFACE_INVERSE_INDEX])) |
| 6068 | return 0; /* same as default */ | 6068 | return 0; /* same as default */ |
| 6069 | else | 6069 | else |
| 6070 | test_caps |= TTY_CAP_INVERSE; | 6070 | test_caps |= TTY_CAP_INVERSE; |
| @@ -6107,7 +6107,7 @@ tty_supports_face_attributes_p (f, attrs, def_face) | |||
| 6107 | bg = attrs[LFACE_BACKGROUND_INDEX]; | 6107 | bg = attrs[LFACE_BACKGROUND_INDEX]; |
| 6108 | if (STRINGP (bg)) | 6108 | if (STRINGP (bg)) |
| 6109 | { | 6109 | { |
| 6110 | Lisp_Object def_bg = def_attrs[LFACE_FOREGROUND_INDEX]; | 6110 | Lisp_Object def_bg = def_attrs[LFACE_BACKGROUND_INDEX]; |
| 6111 | 6111 | ||
| 6112 | if (face_attr_equal_p (bg, def_bg)) | 6112 | if (face_attr_equal_p (bg, def_bg)) |
| 6113 | return 0; /* same as default */ | 6113 | return 0; /* same as default */ |