From a13ab63fff728bd2661bd08db23af7adb3228f3c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 27 Aug 2007 03:54:16 +0000 Subject: [PATCH] (tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX and LFACE_BACKGROUND_INDEX in incorrectly copied code. --- admin/FOR-RELEASE | 2 ++ src/ChangeLog | 10 ++++++++++ src/xfaces.c | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 35f6850cbf..506fb31622 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -49,6 +49,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00385.html ** Check all non-file-scope static vars to make sure they won't lose on USG or HPUX systems. +** davidk@lysator.liu.se, 21 Jun: display-buffer change. + * FIXES FOR EMACS 22.3 Here we list any small fixes that arrived too late for Emacs 22.2, but diff --git a/src/ChangeLog b/src/ChangeLog index bf4629774e..73a906bcc5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2007-08-27 Richard Stallman + + * eval.c (condition-case): Doc fix. + +2007-08-27 Masatake YAMATO + + * xfaces.c (tty_supports_face_attributes_p): Fix code + for LFACE_INVERSE_INDEX and LFACE_BACKGROUND_INDEX; code + was copied and not edited. + 2007-08-23 Stefan Monnier * lread.c (load_warn_old_style_backquotes): Fix up array size typo. diff --git a/src/xfaces.c b/src/xfaces.c index 31e033736f..26c98c4165 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6064,7 +6064,7 @@ tty_supports_face_attributes_p (f, attrs, def_face) val = attrs[LFACE_INVERSE_INDEX]; if (!UNSPECIFIEDP (val)) { - if (face_attr_equal_p (val, def_attrs[LFACE_UNDERLINE_INDEX])) + if (face_attr_equal_p (val, def_attrs[LFACE_INVERSE_INDEX])) return 0; /* same as default */ else test_caps |= TTY_CAP_INVERSE; @@ -6107,7 +6107,7 @@ tty_supports_face_attributes_p (f, attrs, def_face) bg = attrs[LFACE_BACKGROUND_INDEX]; if (STRINGP (bg)) { - Lisp_Object def_bg = def_attrs[LFACE_FOREGROUND_INDEX]; + Lisp_Object def_bg = def_attrs[LFACE_BACKGROUND_INDEX]; if (face_attr_equal_p (bg, def_bg)) return 0; /* same as default */ -- 2.20.1