aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2009-05-14 21:37:02 +0000
committerChong Yidong2009-05-14 21:37:02 +0000
commit337fbd17184a89fb26d9b3752ac2688b500eb761 (patch)
tree00e67c69a0ed485d580f63b549b9b89e78ff3577 /src
parent05be46d79eb75119374360f01c9d892948b01633 (diff)
downloademacs-337fbd17184a89fb26d9b3752ac2688b500eb761.tar.gz
emacs-337fbd17184a89fb26d9b3752ac2688b500eb761.zip
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
weight when testing attributes (Bug#3282).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfaces.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e4afbc9298a..e5516d26619 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-05-14 Chong Yidong <cyd@stupidchicken.com>
2
3 * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
4 weight when testing attributes (Bug#3282).
5
12009-05-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62009-05-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * gtkutil.c (xg_frame_set_char_size): Set frame pixel width/height to 8 * gtkutil.c (xg_frame_set_char_size): Set frame pixel width/height to
diff --git a/src/xfaces.c b/src/xfaces.c
index 152a1d65edd..444376838b9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5175,8 +5175,9 @@ tty_supports_face_attributes_p (f, attrs, def_face)
5175 /* Test for terminal `capabilities' (non-color character attributes). */ 5175 /* Test for terminal `capabilities' (non-color character attributes). */
5176 5176
5177 /* font weight (bold/dim) */ 5177 /* font weight (bold/dim) */
5178 weight = FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]); 5178 val = attrs[LFACE_WEIGHT_INDEX];
5179 if (weight >= 0) 5179 if (!UNSPECIFIEDP (val)
5180 && (weight = FONT_WEIGHT_NAME_NUMERIC (val), weight >= 0))
5180 { 5181 {
5181 int def_weight = FONT_WEIGHT_NAME_NUMERIC (def_attrs[LFACE_WEIGHT_INDEX]); 5182 int def_weight = FONT_WEIGHT_NAME_NUMERIC (def_attrs[LFACE_WEIGHT_INDEX]);
5182 5183