mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 05:01:02 -08:00
Code Issues Projects Releases Wiki Activity

* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.

Browse source
This commit is contained in:
Jan Djärv 2004-10-22 12:56:09 +00:00
parent 38be9dbb6f
commit 63ea8ea52f
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2004-10-22 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
2004-10-21 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* xterm.h (x_output): New member `xic_base_fontname'.

16
src/xfns.c
View file

@ -1949,7 +1949,7 @@ xic_create_xfontset (f, base_fontname)
char *base_fontname;
{
XFontSet xfs = NULL;
char **missing_list;
char **missing_list = NULL;
int missing_count;
char *def_string;
Lisp_Object rest, frame;
@ -1968,12 +1968,14 @@ xic_create_xfontset (f, base_fontname)
}
if (!xfs)
/* New fontset. */
xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
base_fontname, &missing_list,
&missing_count, &def_string);
if (missing_list)
XFreeStringList (missing_list);
{
/* New fontset. */
xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
base_fontname, &missing_list,
&missing_count, &def_string);
if (missing_list)
XFreeStringList (missing_list);
}
if (FRAME_XIC_BASE_FONTNAME (f))
xfree (FRAME_XIC_BASE_FONTNAME (f));