aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-03-02 05:48:00 +0000
committerKarl Heuer1994-03-02 05:48:00 +0000
commit74712156d663b59a94f55da83101ea27b140e16e (patch)
treefe57748fca8d1ddd78be30af1152b1ec792e8588 /src
parent048822963e17ee237955b42ca4597775dba4374e (diff)
downloademacs-74712156d663b59a94f55da83101ea27b140e16e.tar.gz
emacs-74712156d663b59a94f55da83101ea27b140e16e.zip
(Fx_list_fonts): Avoid confused increment of info.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 19c0f0b3739..c5a064809fa 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2582,15 +2582,17 @@ fonts), even if they match PATTERN and FACE.")
2582 tail = &list; 2582 tail = &list;
2583 for (i = 0; i < num_fonts; i++) 2583 for (i = 0; i < num_fonts; i++)
2584 { 2584 {
2585 XFontStruct *thisinfo;
2586
2585#ifdef BROKEN_XLISTFONTSWITHINFO 2587#ifdef BROKEN_XLISTFONTSWITHINFO
2586 BLOCK_INPUT; 2588 BLOCK_INPUT;
2587 info = XLoadQueryFont (x_current_display, names[i]); 2589 thisinfo = XLoadQueryFont (x_current_display, names[i]);
2588 UNBLOCK_INPUT; 2590 UNBLOCK_INPUT;
2589#else 2591#else
2590 info = &info[i]; 2592 thisinfo = &info[i];
2591#endif 2593#endif
2592 if (info && (! size_ref 2594 if (thisinfo && (! size_ref
2593 || same_size_fonts (info, size_ref))) 2595 || same_size_fonts (thisinfo, size_ref)))
2594 { 2596 {
2595 *tail = Fcons (build_string (names[i]), Qnil); 2597 *tail = Fcons (build_string (names[i]), Qnil);
2596 tail = &XCONS (*tail)->cdr; 2598 tail = &XCONS (*tail)->cdr;