comparison src/xterm.c @ 89353:f1507fc0d6e6

(x_new_fontset): Change the arg FONTSETNAME to Lisp string. Use new_fontset_from_font_name to create a fontset from a font name.

89352:ffa18ef18e45

   Qnil.  */

Lisp_Object
x_new_fontset (f, fontsetname)
     struct frame *f;
     char *fontsetname;
{
  int fontset = fs_query_fontset (build_string (fontsetname), 0);
  Lisp_Object result;

  if (fontset > 0 && f->output_data.x->fontset == fontset)
    /* This fontset is already set in frame F.  There's nothing more
       to do.  */

    return Qt;

  if (fontset >= 0)
    result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));
  else
    result = x_new_font (f, fontsetname);

  if (!STRINGP (result))
    /* Can't load ASCII font.  */
    return Qnil;

  if (fontset < 0)
    {
      Lisp_Object func;

      func = intern ("create-fontset-from-ascii-font");
      if (! NILP (Ffboundp (func)))
	result = call2 (func, result, result);
      else
	Fnew_fontset (result,
		      Fcons (Fcons (Qascii, Fcons (result, Qnil)), Qnil));
      fontset = fs_query_fontset (result, 0);
    }

  /* Since x_new_font doesn't update any fontset information, do it now.  */
  f->output_data.x->fontset = fontset;

#ifdef HAVE_X_I18N

89353:f1507fc0d6e6

   Qnil.  */

Lisp_Object
x_new_fontset (f, fontsetname)
     struct frame *f;
     Lisp_Object fontsetname;
{
  int fontset = fs_query_fontset (fontsetname, 0);
  Lisp_Object result;

  if (fontset > 0 && f->output_data.x->fontset == fontset)
    /* This fontset is already set in frame F.  There's nothing more
       to do.  */

    return Qt;

  if (fontset >= 0)
    result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));
  else
    result = x_new_font (f, XSTRING (fontsetname)->data);

  if (!STRINGP (result))
    /* Can't load ASCII font.  */
    return Qnil;

  fontset = fs_query_fontset (result, 0);
  if (fontset < 0)
    fontset = new_fontset_from_font_name (result);

  /* Since x_new_font doesn't update any fontset information, do it now.  */
  f->output_data.x->fontset = fontset;

#ifdef HAVE_X_I18N