From 3692570fcd22c68766494d5f3046dc5e875cbb6d Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 3 Jun 2008 05:57:56 +0000 Subject: [PATCH] (font_prop_validate_spacing): Handle uppercase symbols. --- src/font.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/font.c b/src/font.c index 8cd3896b045..81a4914ba79 100644 --- a/src/font.c +++ b/src/font.c @@ -537,14 +537,19 @@ font_prop_validate_spacing (prop, val) { if (NILP (val) || (NATNUMP (val) && XINT (val) <= FONT_SPACING_CHARCELL)) return val; - if (EQ (val, Qc)) - return make_number (FONT_SPACING_CHARCELL); - if (EQ (val, Qm)) - return make_number (FONT_SPACING_MONO); - if (EQ (val, Qp)) - return make_number (FONT_SPACING_PROPORTIONAL); - if (EQ (val, Qd)) - return make_number (FONT_SPACING_DUAL); + if (SYMBOLP (val) && SBYTES (SYMBOL_NAME (val)) == 1) + { + char spacing = SDATA (SYMBOL_NAME (val))[0]; + + if (spacing == 'c' || spacing == 'C') + return make_number (FONT_SPACING_CHARCELL); + if (spacing == 'm' || spacing == 'M') + return make_number (FONT_SPACING_MONO); + if (spacing == 'P' || spacing == 'P') + return make_number (FONT_SPACING_PROPORTIONAL); + if (spacing == 'd' || spacing == 'D') + return make_number (FONT_SPACING_DUAL); + } return Qerror; } -- 2.39.2