# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1098820056 0
# Node ID 7920b90a583c7a2e1edb078d65ee88ada453b37a
# Parent  156f101971e48e2ac01bb0592a4dda01b89a7ffb
* xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
  is not NULL before strcmp.

diff -r 156f101971e4 -r 7920b90a583c src/xfns.c
--- a/src/xfns.c	Tue Oct 26 19:09:40 2004 +0000
+++ b/src/xfns.c	Tue Oct 26 19:47:36 2004 +0000
@@ -1960,6 +1960,7 @@
       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);