diff options
| author | Dmitry Antipov | 2014-04-02 20:17:08 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-04-02 20:17:08 +0400 |
| commit | ed859c7aea4db00135a2c0e692895b3d13e99351 (patch) | |
| tree | 1be2b3dae20f94c04dc03628ae636ce918dd4ab5 /src/xterm.c | |
| parent | 09aba8153a8297e415477dbfa9a8c7e999fb3457 (diff) | |
| download | emacs-ed859c7aea4db00135a2c0e692895b3d13e99351.tar.gz emacs-ed859c7aea4db00135a2c0e692895b3d13e99351.zip | |
* xterm.c (x_term_init) [USE_LUCID]: Fix minor memory leak.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index b0d64dfeb7f..8c4e78073dd 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10162,6 +10162,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10162 | 10162 | ||
| 10163 | #ifdef USE_LUCID | 10163 | #ifdef USE_LUCID |
| 10164 | { | 10164 | { |
| 10165 | XFontStruct *xfont = NULL; | ||
| 10165 | XrmValue d, fr, to; | 10166 | XrmValue d, fr, to; |
| 10166 | Font font; | 10167 | Font font; |
| 10167 | 10168 | ||
| @@ -10175,8 +10176,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10175 | x_catch_errors (dpy); | 10176 | x_catch_errors (dpy); |
| 10176 | if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL)) | 10177 | if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL)) |
| 10177 | emacs_abort (); | 10178 | emacs_abort (); |
| 10178 | if (x_had_errors_p (dpy) || !XQueryFont (dpy, font)) | 10179 | if (x_had_errors_p (dpy) || !((xfont = XQueryFont (dpy, font)))) |
| 10179 | XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15"); | 10180 | XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15"); |
| 10181 | if (xfont) | ||
| 10182 | XFreeFont (dpy, xfont); | ||
| 10180 | x_uncatch_errors (); | 10183 | x_uncatch_errors (); |
| 10181 | } | 10184 | } |
| 10182 | #endif | 10185 | #endif |