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
0169d360
Commit
0169d360
authored
Jun 16, 2006
by
Kenichi Handa
Browse files
(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
of x_new_fontset2.
parent
706b6995
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
1 deletion
+32
-1
src/frame.c
src/frame.c
+32
-1
No files found.
src/frame.c
View file @
0169d360
...
...
@@ -3077,7 +3077,38 @@ x_set_font (f, arg, oldval)
#ifdef USE_FONT_BACKEND
if
(
enable_font_backend
)
fontset_name
=
result
=
x_new_fontset2
(
f
,
arg
);
{
int
fontset
=
-
1
;
Lisp_Object
font_object
;
/* ARG is a fontset name, a font name, or a font object.
In the last case, this function never fail. */
if
(
STRINGP
(
arg
))
{
fontset
=
fs_query_fontset
(
arg
,
Qnil
);
if
(
fontset
<
0
)
font_object
=
font_open_by_name
(
f
,
SDATA
(
arg
));
else
if
(
fontset
>
0
)
{
Lisp_Object
ascii_font
=
fontset_ascii
(
fontset
);
font_object
=
font_open_by_name
(
f
,
SDATA
(
arg
));
}
}
else
font_object
=
arg
;
if
(
fontset
<
0
&&
!
NILP
(
font_object
))
fontset
=
new_fontset_from_font
(
font_object
);
if
(
fontset
==
0
)
/* Refuse the default fontset. */
result
=
Qt
;
else
if
(
NILP
(
font_object
))
result
=
Qnil
;
else
result
=
x_new_fontset2
(
f
,
fontset
,
font_object
);
}
else
{
#endif
/* USE_FONT_BACKEND */
...
...
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