comparison src/fontset.c @ 90056:b0c203a8776d

(Fset_fontset_font): Call find_font_encoding with concatenation of family and registry.

90055:e4029991605f

appended.  By default, FONT-SPEC overrides the previous settings.  */)
     (name, target, font_spec, frame, add)
     Lisp_Object name, target, font_spec, frame, add;
{
  Lisp_Object fontset;
  Lisp_Object font_def, registry;
  Lisp_Object encoding, repertory;
  Lisp_Object range_list;
  struct charset *charset = NULL;

  fontset = check_fontset_name (name);

      ASET (font_spec, FONT_SPEC_REGISTRY_INDEX, registry);

    }
  else if (CONSP (font_spec))
    {
      Lisp_Object family;

      family = XCAR (font_spec);
      registry = XCDR (font_spec);

      if (! NILP (family))
	{

    }

  if (STRINGP (font_spec))
    encoding = find_font_encoding (font_spec);
  else
    encoding = find_font_encoding (registry);
  if (SYMBOLP (encoding))
    {
      CHECK_CHARSET (encoding);
      encoding = repertory = CHARSET_SYMBOL_ID (encoding);
    }

90056:b0c203a8776d

appended.  By default, FONT-SPEC overrides the previous settings.  */)
     (name, target, font_spec, frame, add)
     Lisp_Object name, target, font_spec, frame, add;
{
  Lisp_Object fontset;
  Lisp_Object font_def, registry, family;
  Lisp_Object encoding, repertory;
  Lisp_Object range_list;
  struct charset *charset = NULL;

  fontset = check_fontset_name (name);

      ASET (font_spec, FONT_SPEC_REGISTRY_INDEX, registry);

    }
  else if (CONSP (font_spec))
    {
      family = XCAR (font_spec);
      registry = XCDR (font_spec);

      if (! NILP (family))
	{

    }

  if (STRINGP (font_spec))
    encoding = find_font_encoding (font_spec);
  else
    encoding = find_font_encoding (concat2 (family, registry));
  if (SYMBOLP (encoding))
    {
      CHECK_CHARSET (encoding);
      encoding = repertory = CHARSET_SYMBOL_ID (encoding);
    }