[Emacs-diffs] Changes to emacs/src/xfaces.c

[Stefan Monnier]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.250 emacs/src/xfaces.c:1.251
*** emacs/src/xfaces.c:1.250    Wed Feb 13 11:21:07 2002
--- emacs/src/xfaces.c  Fri Apr 19 14:36:58 2002
***************
*** 1054,1065 ****
        if (font_info->name == NULL)
        continue;
  
!       /* Don't free a default font of some frame on this display.  */
        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;
        }
--- 1054,1064 ----
        if (font_info->name == NULL)
        continue;
  
!       /* Don't free a default font of some frame.  */
        FOR_EACH_FRAME (tail, frame)
        {
          struct frame *f = XFRAME (frame);
          if (FRAME_WINDOW_P (f)
              && font_info->font == FRAME_FONT (f))
            break;
        }
***************
*** 4052,4058 ****
    else if (EQ (attr, QCfont))
      {
  #ifdef HAVE_WINDOW_SYSTEM
!       if (FRAME_WINDOW_P (XFRAME (frame)))
        {
          /* Set font-related attributes of the Lisp face from an XLFD
             font name.  */
--- 4051,4057 ----
    else if (EQ (attr, QCfont))
      {
  #ifdef HAVE_WINDOW_SYSTEM
!       if (EQ (frame, Qt) || FRAME_WINDOW_P (XFRAME (frame)))
        {
          /* Set font-related attributes of the Lisp face from an XLFD
             font name.  */