[Emacs-diffs] emacs/src ChangeLog xfaces.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/05/14 21:37:04

Modified files:
        src            : ChangeLog xfaces.c 

Log message:
        * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
        weight when testing attributes (Bug#3282).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7544&r2=1.7545
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.434&r2=1.435

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7544
retrieving revision 1.7545
diff -u -b -r1.7544 -r1.7545
--- ChangeLog   11 May 2009 09:30:34 -0000      1.7544
+++ ChangeLog   14 May 2009 21:37:02 -0000      1.7545
@@ -1,3 +1,8 @@
+2009-05-14  Chong Yidong  <address@hidden>
+
+       * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
+       weight when testing attributes (Bug#3282).
+
 2009-05-11  YAMAMOTO Mitsuharu  <address@hidden>
 
        * gtkutil.c (xg_frame_set_char_size): Set frame pixel width/height to

Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- xfaces.c    30 Apr 2009 05:02:06 -0000      1.434
+++ xfaces.c    14 May 2009 21:37:03 -0000      1.435
@@ -5175,8 +5175,9 @@
   /* Test for terminal `capabilities' (non-color character attributes).  */
 
   /* font weight (bold/dim) */
-  weight = FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]);
-  if (weight >= 0)
+  val = attrs[LFACE_WEIGHT_INDEX];
+  if (!UNSPECIFIEDP (val)
+      && (weight = FONT_WEIGHT_NAME_NUMERIC (val), weight >= 0))
     {
       int def_weight = FONT_WEIGHT_NAME_NUMERIC 
(def_attrs[LFACE_WEIGHT_INDEX]);