diff options
| author | Jan Djärv | 2004-10-22 12:56:09 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-10-22 12:56:09 +0000 |
| commit | 63ea8ea52fbe8ffbbb06f5a1b5917c63eeaaf47f (patch) | |
| tree | aa6fe853f1e4d1003b63771971c39bbb058cc403 /src/xfns.c | |
| parent | 38be9dbb6f9b1204cd0d36ad032fc8e7a7524ef1 (diff) | |
| download | emacs-63ea8ea52fbe8ffbbb06f5a1b5917c63eeaaf47f.tar.gz emacs-63ea8ea52fbe8ffbbb06f5a1b5917c63eeaaf47f.zip | |
* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/xfns.c b/src/xfns.c index 8d539472d11..2889975e175 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1949,7 +1949,7 @@ xic_create_xfontset (f, base_fontname) | |||
| 1949 | char *base_fontname; | 1949 | char *base_fontname; |
| 1950 | { | 1950 | { |
| 1951 | XFontSet xfs = NULL; | 1951 | XFontSet xfs = NULL; |
| 1952 | char **missing_list; | 1952 | char **missing_list = NULL; |
| 1953 | int missing_count; | 1953 | int missing_count; |
| 1954 | char *def_string; | 1954 | char *def_string; |
| 1955 | Lisp_Object rest, frame; | 1955 | Lisp_Object rest, frame; |
| @@ -1968,12 +1968,14 @@ xic_create_xfontset (f, base_fontname) | |||
| 1968 | } | 1968 | } |
| 1969 | 1969 | ||
| 1970 | if (!xfs) | 1970 | if (!xfs) |
| 1971 | /* New fontset. */ | 1971 | { |
| 1972 | xfs = XCreateFontSet (FRAME_X_DISPLAY (f), | 1972 | /* New fontset. */ |
| 1973 | base_fontname, &missing_list, | 1973 | xfs = XCreateFontSet (FRAME_X_DISPLAY (f), |
| 1974 | &missing_count, &def_string); | 1974 | base_fontname, &missing_list, |
| 1975 | if (missing_list) | 1975 | &missing_count, &def_string); |
| 1976 | XFreeStringList (missing_list); | 1976 | if (missing_list) |
| 1977 | XFreeStringList (missing_list); | ||
| 1978 | } | ||
| 1977 | 1979 | ||
| 1978 | if (FRAME_XIC_BASE_FONTNAME (f)) | 1980 | if (FRAME_XIC_BASE_FONTNAME (f)) |
| 1979 | xfree (FRAME_XIC_BASE_FONTNAME (f)); | 1981 | xfree (FRAME_XIC_BASE_FONTNAME (f)); |