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
b1bde622
Commit
b1bde622
authored
Dec 03, 2008
by
Kenichi Handa
Browse files
(face_for_char): Handle invalid charset property
correctly. (font_for_char): Likewise.
parent
2cf4d521
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
src/ChangeLog
src/ChangeLog
+6
-0
src/fontset.c
src/fontset.c
+6
-6
No files found.
src/ChangeLog
View file @
b1bde622
2008-12-03 Kenichi Handa <handa@m17n.org>
* fontset.c (face_for_char): Handle invalid charset property
correctly.
(font_for_char): Likewise.
2008-12-03 Chong Yidong <cyd@stupidchicken.com>
* font.c (Fopen_font): Compute pixel size correctly.
...
...
src/fontset.c
View file @
b1bde622
...
...
@@ -894,9 +894,7 @@ face_for_char (f, face, c, pos, object)
else
{
charset
=
Fget_char_property
(
make_number
(
pos
),
Qcharset
,
object
);
if (NILP (charset))
id = -1;
else if (CHARSETP (charset))
if
(
CHARSETP
(
charset
))
{
Lisp_Object
val
;
...
...
@@ -905,6 +903,8 @@ face_for_char (f, face, c, pos, object)
charset
=
XCDR
(
val
);
id
=
XINT
(
CHARSET_SYMBOL_ID
(
charset
));
}
else
id
=
-
1
;
}
font_deferred_log
(
"font for"
,
Fcons
(
make_number
(
c
),
charset
),
Qnil
);
...
...
@@ -966,9 +966,7 @@ font_for_char (face, c, pos, object)
else
{
charset
=
Fget_char_property
(
make_number
(
pos
),
Qcharset
,
object
);
if (NILP (charset))
id = -1;
else if (CHARSETP (charset))
if
(
CHARSETP
(
charset
))
{
Lisp_Object
val
;
...
...
@@ -977,6 +975,8 @@ font_for_char (face, c, pos, object)
charset
=
XCDR
(
val
);
id
=
XINT
(
CHARSET_SYMBOL_ID
(
charset
));
}
else
id
=
-
1
;
}
font_deferred_log
(
"font for"
,
Fcons
(
make_number
(
c
),
charset
),
Qnil
);
...
...
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