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
25c26e74
Commit
25c26e74
authored
Apr 10, 1996
by
Richard M. Stallman
Browse files
(Fx_list_fonts): Handle X protocol errors.
parent
28335560
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
2 deletions
+18
-2
src/xfns.c
src/xfns.c
+18
-2
No files found.
src/xfns.c
View file @
25c26e74
...
...
@@ -3386,10 +3386,15 @@ even if they match PATTERN and FACE.")
{
XFontStruct
*
thisinfo
;
thisinfo
=
XLoadQueryFont
(
FRAME_X_DISPLAY
(
f
),
x_catch_errors
(
FRAME_X_DISPLAY
(
f
));
thisinfo
=
XLoadQueryFont
(
FRAME_X_DISPLAY
(
f
),
XSTRING
(
XCONS
(
tem
)
->
car
)
->
data
);
if
(
thisinfo
&&
same_size_fonts
(
thisinfo
,
size_ref
))
x_check_errors
(
FRAME_X_DISPLAY
(
f
),
"XLoadQueryFont failure: %s"
);
x_uncatch_errors
(
FRAME_X_DISPLAY
(
f
));
if
(
thisinfo
&&
same_size_fonts
(
thisinfo
,
size_ref
))
newlist
=
Fcons
(
XCONS
(
tem
)
->
car
,
newlist
);
if
(
thisinfo
!=
0
)
...
...
@@ -3403,6 +3408,8 @@ even if they match PATTERN and FACE.")
BLOCK_INPUT
;
x_catch_errors
(
FRAME_X_DISPLAY
(
f
));
/* Solaris 2.3 has a bug in XListFontsWithInfo. */
#ifndef BROKEN_XLISTFONTSWITHINFO
if
(
size_ref
)
...
...
@@ -3418,6 +3425,9 @@ even if they match PATTERN and FACE.")
2000
,
/* maxnames */
&
num_fonts
);
/* count_return */
x_check_errors
(
FRAME_X_DISPLAY
(
f
),
"XListFonts failure: %s"
);
x_uncatch_errors
(
FRAME_X_DISPLAY
(
f
));
UNBLOCK_INPUT
;
list
=
Qnil
;
...
...
@@ -3450,7 +3460,13 @@ even if they match PATTERN and FACE.")
XFontStruct
*
thisinfo
;
BLOCK_INPUT
;
x_catch_errors
(
FRAME_X_DISPLAY
(
f
));
thisinfo
=
XLoadQueryFont
(
FRAME_X_DISPLAY
(
f
),
names
[
i
]);
x_check_errors
(
FRAME_X_DISPLAY
(
f
),
"XLoadQueryFont failure: %s"
);
x_uncatch_errors
(
FRAME_X_DISPLAY
(
f
));
UNBLOCK_INPUT
;
keeper
=
thisinfo
&&
same_size_fonts
(
thisinfo
,
size_ref
);
...
...
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