Mercurial > emacs
changeset 96017:54d310663505
(font_unparse_gtkname): Use EQ to compare Lisp_Objects.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 16 Jun 2008 19:11:02 +0000 |
| parents | c1105df0f9c8 |
| children | 47c289fef3ec |
| files | src/ChangeLog src/font.c |
| diffstat | 2 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jun 16 14:35:24 2008 +0000 +++ b/src/ChangeLog Mon Jun 16 19:11:02 2008 +0000 @@ -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.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. + * 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. + + * w32font.c (w32_to_fc_weight): New function. + (w32font_full_name, logfont_to_fcname): Use it. 2008-06-16 Kenichi Handa <handa@m17n.org>
--- a/src/font.c Mon Jun 16 14:35:24 2008 +0000 +++ b/src/font.c Mon Jun 16 19:11:02 2008 +0000 @@ -1734,7 +1734,7 @@ } 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 @@ } slant = font_style_symbolic (font, FONT_SLANT_INDEX, 0); - if (slant == Qnormal) + if (EQ (slant, Qnormal)) slant = Qnil; else if (! NILP (slant)) {