changeset 103228:7300fabaa28b

* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified weight when testing attributes (Bug#3282).
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 14 May 2009 21:37:02 +0000
parents aa902960b81b
children 499a2bc2b600
files src/ChangeLog src/xfaces.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu May 14 04:29:45 2009 +0000
+++ b/src/ChangeLog	Thu May 14 21:37:02 2009 +0000
@@ -1,3 +1,8 @@
+2009-05-14  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
+	weight when testing attributes (Bug#3282).
+
 2009-05-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* gtkutil.c (xg_frame_set_char_size): Set frame pixel width/height to
--- a/src/xfaces.c	Thu May 14 04:29:45 2009 +0000
+++ b/src/xfaces.c	Thu May 14 21:37:02 2009 +0000
@@ -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]);