Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
93eed26b
Commit
93eed26b
authored
Jun 16, 2008
by
Stefan Monnier
Browse files
(font_unparse_gtkname): Use EQ to compare Lisp_Objects.
parent
77989187
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
src/ChangeLog
src/ChangeLog
+9
-5
src/font.c
src/font.c
+2
-2
No files found.
src/ChangeLog
View file @
93eed26b
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>
...
...
src/font.c
View file @
93eed26b
...
...
@@ -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
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment