diff options
| author | Jan Djärv | 2004-10-26 19:47:36 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-10-26 19:47:36 +0000 |
| commit | 9db6ae810de05cfbb9e3de3518532035bf256523 (patch) | |
| tree | 842c833761212b58f5755d50abddf4c3034159fd /src | |
| parent | 8cb77f98f0cfb2bb459ead5006a03d83d3eb5ead (diff) | |
| download | emacs-9db6ae810de05cfbb9e3de3518532035bf256523.tar.gz emacs-9db6ae810de05cfbb9e3de3518532035bf256523.zip | |
* xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
is not NULL before strcmp.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c index 2889975e175..ae308c562ba 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1960,6 +1960,7 @@ xic_create_xfontset (f, base_fontname) | |||
| 1960 | struct frame *cf = XFRAME (frame); | 1960 | struct frame *cf = XFRAME (frame); |
| 1961 | if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf) | 1961 | if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf) |
| 1962 | && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f) | 1962 | && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f) |
| 1963 | && FRAME_XIC_BASE_FONTNAME (cf) | ||
| 1963 | && !strcmp (FRAME_XIC_BASE_FONTNAME (cf), base_fontname)) | 1964 | && !strcmp (FRAME_XIC_BASE_FONTNAME (cf), base_fontname)) |
| 1964 | { | 1965 | { |
| 1965 | xfs = FRAME_XIC_FONTSET (cf); | 1966 | xfs = FRAME_XIC_FONTSET (cf); |