From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 26 Oct 2004 19:47:36 +0000 (+0000)
Subject: * xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
X-Git-Tag: ttn-vms-21-2-B4~4388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9db6ae810de05cfbb9e3de3518532035bf256523;p=emacs.git

* xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
  is not NULL before strcmp.
---

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)
       struct frame *cf = XFRAME (frame);
       if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf)
           && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f)
+          && FRAME_XIC_BASE_FONTNAME (cf)
           && !strcmp (FRAME_XIC_BASE_FONTNAME (cf), base_fontname))
         {
           xfs = FRAME_XIC_FONTSET (cf);