Mercurial > emacs
changeset 57643:3b8eabf02bad
* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 22 Oct 2004 12:56:09 +0000 |
| parents | 1cffc97af4c6 |
| children | c0f2bdd90b5d |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 22 11:20:12 2004 +0000 +++ b/src/ChangeLog Fri Oct 22 12:56:09 2004 +0000 @@ -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'.
--- a/src/xfns.c Fri Oct 22 11:20:12 2004 +0000 +++ b/src/xfns.c Fri Oct 22 12:56:09 2004 +0000 @@ -1949,7 +1949,7 @@ 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 @@ } 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));