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

[Richard M. Stallman]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.274 emacs/src/xfaces.c:1.275
*** emacs/src/xfaces.c:1.274    Wed Apr  9 03:26:59 2003
--- emacs/src/xfaces.c  Mon May 19 10:41:09 2003
***************
*** 4156,4175 ****
          struct frame *f;
          Lisp_Object tmp;
  
-         CHECK_STRING (value);
          if (EQ (frame, Qt))
            f = SELECTED_FRAME ();
          else
            f = check_x_frame (frame);
  
!         /* VALUE may be a fontset name or an alias of fontset.  In
!            such a case, use the base fontset name.  */
!         tmp = Fquery_fontset (value, Qnil);
!         if (!NILP (tmp))
!           value = tmp;
  
!         if (!set_lface_from_font_name (f, lface, value, 1, 1))
!           signal_error ("Invalid font or fontset name", value);
  
          font_attr_p = 1;
        }
--- 4156,4179 ----
          struct frame *f;
          Lisp_Object tmp;
  
          if (EQ (frame, Qt))
            f = SELECTED_FRAME ();
          else
            f = check_x_frame (frame);
  
!         if (!UNSPECIFIEDP (value))
!           {
!             CHECK_STRING (value);
! 
!             /* VALUE may be a fontset name or an alias of fontset.  In
!                such a case, use the base fontset name.  */
!             tmp = Fquery_fontset (value, Qnil);
!             if (!NILP (tmp))
!               value = tmp;
  
!             if (!set_lface_from_font_name (f, lface, value, 1, 1))
!               signal_error ("Invalid font or fontset name", value);
!           }
  
          font_attr_p = 1;
        }
***************
*** 6590,6600 ****
    /* If the `default' face is not yet known, create it.  */
    lface = lface_from_face_name (f, Qdefault, 0);
    if (NILP (lface))
!     {
!       Lisp_Object frame;
!       XSETFRAME (frame, f);
!       lface = Finternal_make_lisp_face (Qdefault, frame);
!     }
  
  #ifdef HAVE_WINDOW_SYSTEM
    if (FRAME_WINDOW_P (f))
--- 6594,6600 ----
    /* If the `default' face is not yet known, create it.  */
    lface = lface_from_face_name (f, Qdefault, 0);
    if (NILP (lface))
!     abort ();
  
  #ifdef HAVE_WINDOW_SYSTEM
    if (FRAME_WINDOW_P (f))
***************
*** 6603,6609 ****
        frame_font = Fassq (Qfont, f->param_alist);
        xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
        frame_font = XCDR (frame_font);
!       set_lface_from_font_name (f, lface, frame_font, 1, 1);
      }
  #endif /* HAVE_WINDOW_SYSTEM */
  
--- 6603,6611 ----
        frame_font = Fassq (Qfont, f->param_alist);
        xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
        frame_font = XCDR (frame_font);
!       /* Specify 0 for FORCE_P here, so that we don't override
!        a :family attribute specified for `default' for new frames.  */
!       set_lface_from_font_name (f, lface, frame_font, 0, 1);
      }
  #endif /* HAVE_WINDOW_SYSTEM */