* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified

weight when testing attributes (Bug#3282).

* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
weight when testing attributes (Bug#3282).
337fbd17 · Chong Yidong · 05be46d7 · 337fbd17 · 337fbd17
Commit 337fbd17 authored May 14, 2009 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/xfaces.c src/xfaces.c +3 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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
+++ b/src/xfaces.c
@@ -5175,8 +5175,9 @@ tty_supports_face_attributes_p (f, attrs, def_face)
  /* 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]);