diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-16 19:11:02 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-16 19:11:02 +0000 |
| commit | 93eed26bfbe11048c2d885017504591ad3cbd3c8 (patch) | |
| tree | c62198a27760c25cad719d58615fa81f03f36bca /src | |
| parent | 77989187bfa399f1300260893767ee6ed91e02d6 (diff) | |
| download | emacs-93eed26bfbe11048c2d885017504591ad3cbd3c8.tar.gz | |
(font_unparse_gtkname): Use EQ to compare Lisp_Objects.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/font.c | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dd86145776e..1df8b2ae032 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-06-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * font.c (font_unparse_gtkname): Use EQ to compare Lisp_Objects. + 2008-06-16 Chong Yidong <cyd@stupidchicken.com> * font.c (font_parse_fcname): Fix handling of unknown-spec string. @@ -13,13 +17,13 @@ 2008-06-16 Jason Rumney <jasonr@gnu.org> - * font.h (font_style_symbolic_from_value): Remove. + * font.h (font_style_symbolic_from_value): Remove. - * font.c (font_style_symbolic_from_value): Remove. - (font_style_symbolic): Revert to pre 2008-06-13 version. + * font.c (font_style_symbolic_from_value): Remove. + (font_style_symbolic): Revert to pre 2008-06-13 version. - * w32font.c (w32_to_fc_weight): New function. - (w32font_full_name, logfont_to_fcname): Use it. + * w32font.c (w32_to_fc_weight): New function. + (w32font_full_name, logfont_to_fcname): Use it. 2008-06-16 Kenichi Handa <handa@m17n.org> diff --git a/src/font.c b/src/font.c index 420548171e5..51b7c2ec220 100644 --- a/src/font.c +++ b/src/font.c @@ -1734,7 +1734,7 @@ font_unparse_gtkname (font, f, name, nbytes) } weight = font_style_symbolic (font, FONT_WEIGHT_INDEX, 0); - if (weight == Qnormal) + if (EQ (weight, Qnormal)) weight = Qnil; else if (! NILP (weight)) { @@ -1743,7 +1743,7 @@ font_unparse_gtkname (font, f, name, nbytes) } slant = font_style_symbolic (font, FONT_SLANT_INDEX, 0); - if (slant == Qnormal) + if (EQ (slant, Qnormal)) slant = Qnil; else if (! NILP (slant)) { |