Mercurial > emacs
comparison src/xfns.c @ 57714:7920b90a583c
* xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
is not NULL before strcmp.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Tue, 26 Oct 2004 19:47:36 +0000 |
parents | 3b8eabf02bad |
children | 77c93cbb1721 0fe073a08cef |
comparison
equal
deleted
inserted
replaced
57713:156f101971e4 | 57714:7920b90a583c |
---|---|
1958 FOR_EACH_FRAME (rest, frame) | 1958 FOR_EACH_FRAME (rest, frame) |
1959 { | 1959 { |
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); |
1966 break; | 1967 break; |
1967 } | 1968 } |