# HG changeset patch # User Stefan Monnier # Date 1019241418 0 # Node ID 413dd322c77dcd9b4fdcb0830077d23dda575122 # Parent 9facddb1637682cc06867cebf8e86be05cd1e00d (clear_font_table): Don't free the default font of a frame even if it's on another display. (Finternal_set_lisp_face_attribute): Don't use XFRAME on something that could be Qt. diff -r 9facddb16376 -r 413dd322c77d src/xfaces.c --- a/src/xfaces.c Fri Apr 19 16:27:09 2002 +0000 +++ b/src/xfaces.c Fri Apr 19 18:36:58 2002 +0000 @@ -1054,12 +1054,11 @@ if (font_info->name == NULL) continue; - /* Don't free a default font of some frame on this display. */ + /* Don't free a default font of some frame. */ FOR_EACH_FRAME (tail, frame) { struct frame *f = XFRAME (frame); if (FRAME_WINDOW_P (f) - && FRAME_X_DISPLAY_INFO (f) == dpyinfo && font_info->font == FRAME_FONT (f)) break; } @@ -4052,7 +4051,7 @@ else if (EQ (attr, QCfont)) { #ifdef HAVE_WINDOW_SYSTEM - if (FRAME_WINDOW_P (XFRAME (frame))) + if (EQ (frame, Qt) || FRAME_WINDOW_P (XFRAME (frame))) { /* Set font-related attributes of the Lisp face from an XLFD font name. */