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
48728c92
Commit
48728c92
authored
May 14, 2002
by
Kenichi Handa
Browse files
(fs_load_font): Check fontp->full_name (not fontname)
against Vfont_encoding_alist.
parent
5afaefc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
src/ChangeLog
src/ChangeLog
+3
-0
src/fontset.c
src/fontset.c
+2
-1
No files found.
src/ChangeLog
View file @
48728c92
2002-05-14 Kenichi Handa <handa@etl.go.jp>
* fontset.c (fs_load_font): Check fontp->full_name (not fontname)
against Vfont_encoding_alist.
* coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
handling of charset list.
(encode_coding_iso_2022): Setup coding->safe_charsets in advance.
...
...
src/fontset.c
View file @
48728c92
...
...
@@ -549,6 +549,7 @@ fs_load_font (f, fontname)
if
(
!
fontp
)
return
NULL
;
fontname
=
fontp
->
full_name
;
/* Fill in members (charset, vertical_centering, encoding, etc) of
font_info structure that are not set by (*load_font_func). */
for
(
tail
=
Vfont_encoding_alist
;
CONSP
(
tail
);
tail
=
XCDR
(
tail
))
...
...
@@ -567,7 +568,7 @@ fs_load_font (f, fontname)
fontp
->
vertical_centering
=
(
STRINGP
(
Vvertical_centering_font_regexp
)
&&
(
fast_c_string_match_ignore_case
(
Vvertical_centering_font_regexp
,
font
p
->
full_
name
)
>=
0
));
(
Vvertical_centering_font_regexp
,
fontname
)
>=
0
));
fontp
->
font_encoder
=
NULL
;
...
...
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