procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xterm.c (x_term_init) [USE_LUCID]: Fix minor memory leak.

Browse source
This commit is contained in:
Dmitry Antipov 2014-04-02 20:17:08 +04:00
parent 09aba8153a
commit ed859c7aea
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -23,6 +23,8 @@
(font_matching_entity): Likewise. If matching entity is found, insert
1-item vector with this entity instead of entity itself (Bug#17125).
* xterm.c (x_term_init) [USE_LUCID]: Fix minor memory leak.
2014-04-01 Paul Eggert <eggert@cs.ucla.edu>
* fns.c (validate_subarray): Rename from validate_substring,

5
src/xterm.c
View file

@ -10162,6 +10162,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
#ifdef USE_LUCID
{
XFontStruct *xfont = NULL;
XrmValue d, fr, to;
Font font;
@ -10175,8 +10176,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
x_catch_errors (dpy);
if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL))
emacs_abort ();
if (x_had_errors_p (dpy) || !XQueryFont (dpy, font))
if (x_had_errors_p (dpy) || !((xfont = XQueryFont (dpy, font))))
XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
if (xfont)
XFreeFont (dpy, xfont);
x_uncatch_errors ();
}
#endif