Mercurial > emacs
comparison src/xterm.c @ 38246:b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
with input blocked.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 02 Jul 2001 09:21:08 +0000 |
parents | d65ad759dc22 |
children | 9ec233999747 |
comparison
equal
deleted
inserted
replaced
38245:9ada58a02f7e | 38246:b93fb0eb254d |
---|---|
13435 /* For the moment, width is not known. */ | 13435 /* For the moment, width is not known. */ |
13436 list = Fcons (Fcons (tem, Qnil), list); | 13436 list = Fcons (Fcons (tem, Qnil), list); |
13437 } | 13437 } |
13438 } | 13438 } |
13439 } | 13439 } |
13440 | |
13440 if (!try_XLoadQueryFont) | 13441 if (!try_XLoadQueryFont) |
13441 XFreeFontNames (names); | 13442 { |
13443 BLOCK_INPUT; | |
13444 XFreeFontNames (names); | |
13445 UNBLOCK_INPUT; | |
13446 } | |
13442 } | 13447 } |
13443 | 13448 |
13444 /* Now store the result in the cache. */ | 13449 /* Now store the result in the cache. */ |
13445 XCDR (dpyinfo->name_list_element) | 13450 XCDR (dpyinfo->name_list_element) |
13446 = Fcons (Fcons (key, list), XCDR (dpyinfo->name_list_element)); | 13451 = Fcons (Fcons (key, list), XCDR (dpyinfo->name_list_element)); |
13488 { | 13493 { |
13489 XCDR (tem) | 13494 XCDR (tem) |
13490 = (thisinfo->min_bounds.width == 0 | 13495 = (thisinfo->min_bounds.width == 0 |
13491 ? make_number (0) | 13496 ? make_number (0) |
13492 : make_number (thisinfo->max_bounds.width)); | 13497 : make_number (thisinfo->max_bounds.width)); |
13498 BLOCK_INPUT; | |
13493 XFreeFont (dpy, thisinfo); | 13499 XFreeFont (dpy, thisinfo); |
13500 UNBLOCK_INPUT; | |
13494 } | 13501 } |
13495 else | 13502 else |
13496 /* For unknown reason, the previous call of XListFont had | 13503 /* For unknown reason, the previous call of XListFont had |
13497 returned a font which can't be opened. Record the size | 13504 returned a font which can't be opened. Record the size |
13498 as 0 not to try to open it again. */ | 13505 as 0 not to try to open it again. */ |