comparison src/xfaces.c @ 91346:04866c5fd4b5

(Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]: Fix previous change. If the frame is not on a window system, signal an error.

91345:f8775578c21a

	  else
	    f = check_x_frame (frame);

#ifdef USE_FONT_BACKEND
	  if (enable_font_backend
	      && FRAME_WINDOW_P (XFRAME (frame))
	      && !UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
	    {
	      int fontset;

	      if (EQ (attr, QCfontset))
		{
		  Lisp_Object fontset_name = Fquery_fontset (value, Qnil);

		  if (NILP (fontset_name))
		    signal_error ("Invalid fontset name", value);
		  LFACE_FONTSET (lface) = value;
		}
	      else
		{
		  Lisp_Object font_object;

		  if (FONT_OBJECT_P (value))
		    {
		      font_object = value;
		      fontset = FRAME_FONTSET (f);
		    }
		  else
		    {
		      CHECK_STRING (value);

		      fontset = fs_query_fontset (value, 0);
		      if (fontset >= 0)
			value = fontset_ascii (fontset);
		      else
			fontset = FRAME_FONTSET (f);
		      font_object = font_open_by_name (f, SDATA (value));
		      if (NILP (font_object))
			signal_error ("Invalid font", value);
		    }
		  set_lface_from_font_and_fontset (f, lface, font_object,
						   fontset, 1);
		}
	    }
	  else

91346:04866c5fd4b5

	  else
	    f = check_x_frame (frame);

#ifdef USE_FONT_BACKEND
	  if (enable_font_backend
	      && !UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
	    {
	      tmp = Fquery_fontset (value, Qnil);
	      if (EQ (attr, QCfontset))
		{
		  if (NILP (tmp))
		    signal_error ("Invalid fontset name", value);
		  LFACE_FONTSET (lface) = tmp;
		}
	      else
		{
		  int fontset;
		  Lisp_Object font_object;

		  if (! NILP (tmp))
		    {
		      fontset = fs_query_fontset (tmp, 0);
		      value = fontset_ascii (fontset);
		    }
		  else
		    {
		      fontset = FRAME_FONTSET (f);
		    }
		  font_object = font_open_by_name (f, SDATA (value));
		  if (NILP (font_object))
		    signal_error ("Invalid font", value);
		  set_lface_from_font_and_fontset (f, lface, font_object,
						   fontset, 1);
		}
	    }
	  else