comparison src/keymap.c @ 23734:44546fc7faad

(Fsingle_key_description): Handle generic characters.

23733:e963fc8ca03f

    }
  else
    {
      unsigned char work[4], *str;
      int i = CHAR_STRING (c, work, str);

      bcopy (str, p, i);
      p += i;
    }

  return p;  

  "Return a pretty description of command character KEY.\n\
Control characters turn into C-whatever, etc.")
  (key)
     Lisp_Object key;
{
  char tem[20];

  key = EVENT_HEAD (key);

  if (INTEGERP (key))		/* Normal character */
    {
      *push_key_description (XUINT (key), tem) = 0;
      return build_string (tem);
    }
  else if (SYMBOLP (key))	/* Function key or event-symbol */
    return Fsymbol_name (key);
  else if (STRINGP (key))	/* Buffer names in the menubar.  */
    return Fcopy_sequence (key);

23734:44546fc7faad

    }
  else
    {
      unsigned char work[4], *str;
      int i = CHAR_STRING (c, work, str);
      bcopy (str, p, i);
      p += i;
    }

  return p;  

  "Return a pretty description of command character KEY.\n\
Control characters turn into C-whatever, etc.")
  (key)
     Lisp_Object key;
{
  key = EVENT_HEAD (key);

  if (INTEGERP (key))		/* Normal character */
    {
      unsigned int charset, c1, c2;

      if (SINGLE_BYTE_CHAR_P (XINT (key)))
	charset = 0;
      else
	SPLIT_NON_ASCII_CHAR (XINT (key), charset, c1, c2);

      if (charset
	  && ((c1 >= 0 && c1 < 32)
	      || (c2 >= 0 && c2 < 32)))
	{
	  /* Handle a generic character.  */
	  Lisp_Object name;
	  name = CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX);
	  CHECK_STRING (name, 0);
	  return concat2 (build_string ("Character set "), name);
	}
      else
	{
	  char tem[20];

	  *push_key_description (XUINT (key), tem) = 0;
	  return build_string (tem);
	}
    }
  else if (SYMBOLP (key))	/* Function key or event-symbol */
    return Fsymbol_name (key);
  else if (STRINGP (key))	/* Buffer names in the menubar.  */
    return Fcopy_sequence (key);