comparison src/fontset.c @ 28676:0a677c35ad99

(Fset_fontset_font): Fix docstring. Local variable name change: ch -> character.

28675:a4328cafed66

    error ("Fontset `%s' does not exist", XSTRING (name)->data);
  return FONTSET_FROM_ID (id);
}

DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0,
  "Modify fontset NAME to use FONTNAME for character CHAR.\n\
\n\
CHAR may be a cons; (FROM . TO), where FROM and TO are\n\
non-generic characters.  In that case, use FONTNAME\n\
for all characters in the range FROM and TO (inclusive).\n\
\n\
If NAME is t, an entry in the default fontset is modified.\n\
In that case, FONTNAME should be a registry and encoding name\n\
of a font for CHAR.")
  (name, ch, fontname, frame)
     Lisp_Object name, ch, fontname, frame;
{
  Lisp_Object fontset, elt;
  Lisp_Object realized;
  int from, to;
  int id;

  fontset = check_fontset_name (name);

  if (CONSP (ch))
    {
      /* CH should be (FROM . TO) where FROM and TO are non-generic
	 characters.  */
      CHECK_NUMBER (XCAR (ch), 1);
      CHECK_NUMBER (XCDR (ch), 1);
      from = XINT (XCAR (ch));
      to = XINT (XCDR (ch));
      if (!char_valid_p (from, 0) || !char_valid_p (to, 0))
	error ("Character range should be by non-generic characters.");
      if (!NILP (name)
	  && (SINGLE_BYTE_CHAR_P (from) || SINGLE_BYTE_CHAR_P (to)))
	error ("Can't change font for a single byte character");
    }
  else
    {
      CHECK_NUMBER (ch, 1);
      from = XINT (ch);
      to = from;
    }
  if (!char_valid_p (from, 1))
    invalid_character (from);
  if (SINGLE_BYTE_CHAR_P (from))

28676:0a677c35ad99

    error ("Fontset `%s' does not exist", XSTRING (name)->data);
  return FONTSET_FROM_ID (id);
}

DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0,
  "Modify fontset NAME to use FONTNAME for CHARACTER.\n\
\n\
CHARACTER may be a cons; (FROM . TO), where FROM and TO are\n\
non-generic characters.  In that case, use FONTNAME\n\
for all characters in the range FROM and TO (inclusive).\n\
\n\
If NAME is t, an entry in the default fontset is modified.\n\
In that case, FONTNAME should be a registry and encoding name\n\
of a font for CHARACTER.")
  (name, character, fontname, frame)
     Lisp_Object name, character, fontname, frame;
{
  Lisp_Object fontset, elt;
  Lisp_Object realized;
  int from, to;
  int id;

  fontset = check_fontset_name (name);

  if (CONSP (character))
    {
      /* CH should be (FROM . TO) where FROM and TO are non-generic
	 characters.  */
      CHECK_NUMBER (XCAR (character), 1);
      CHECK_NUMBER (XCDR (character), 1);
      from = XINT (XCAR (character));
      to = XINT (XCDR (character));
      if (!char_valid_p (from, 0) || !char_valid_p (to, 0))
	error ("Character range should be by non-generic characters.");
      if (!NILP (name)
	  && (SINGLE_BYTE_CHAR_P (from) || SINGLE_BYTE_CHAR_P (to)))
	error ("Can't change font for a single byte character");
    }
  else
    {
      CHECK_NUMBER (character, 1);
      from = XINT (character);
      to = from;
    }
  if (!char_valid_p (from, 1))
    invalid_character (from);
  if (SINGLE_BYTE_CHAR_P (from))