comparison src/keymap.c @ 23953:c8cdb4e487cb

(Fsingle_key_description): Handle (control ?x) etc. (Fkey_description): Handle lists like vectors.

23952:4ef8ec98dd43

	  else
	    XSETFASTINT (XVECTOR (vector)->contents[i_before], c);
	}
      keys = vector;
    }
  else if (!VECTORP (keys))
    keys = wrong_type_argument (Qarrayp, keys);

  /* In effect, this computes
     (mapconcat 'single-key-description keys " ")
     but we shouldn't use mapconcat because it can do GC.  */

  len = XVECTOR (keys)->size;
  sep = build_string (" ");
  /* This has one extra element at the end that we don't pass to Fconcat.  */
  args = (Lisp_Object *) alloca (len * 2 * sizeof (Lisp_Object));

  for (i = 0; i < len; i++)
    {
      args[i * 2] = Fsingle_key_description (XVECTOR (keys)->contents[i]);
      args[i * 2 + 1] = sep;
    }

  return Fconcat (len * 2 - 1, args);
}

char *

  "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;

23953:c8cdb4e487cb

	  else
	    XSETFASTINT (XVECTOR (vector)->contents[i_before], c);
	}
      keys = vector;
    }

  if (VECTORP (keys))
    {
      /* In effect, this computes
	 (mapconcat 'single-key-description keys " ")
	 but we shouldn't use mapconcat because it can do GC.  */

      len = XVECTOR (keys)->size;
      sep = build_string (" ");
      /* This has one extra element at the end that we don't pass to Fconcat.  */
      args = (Lisp_Object *) alloca (len * 2 * sizeof (Lisp_Object));

      for (i = 0; i < len; i++)
	{
	  args[i * 2] = Fsingle_key_description (XVECTOR (keys)->contents[i]);
	  args[i * 2 + 1] = sep;
	}
    }
  else if (CONSP (keys))
    {
      /* In effect, this computes
	 (mapconcat 'single-key-description keys " ")
	 but we shouldn't use mapconcat because it can do GC.  */

      len = XFASTINT (Flength (keys));
      sep = build_string (" ");
      /* This has one extra element at the end that we don't pass to Fconcat.  */
      args = (Lisp_Object *) alloca (len * 2 * sizeof (Lisp_Object));

      for (i = 0; i < len; i++)
	{
	  args[i * 2] = Fsingle_key_description (XCONS (keys)->car);
	  args[i * 2 + 1] = sep;
	  keys = XCONS (keys)->cdr;
	}
    }
  else
    keys = wrong_type_argument (Qarrayp, keys);

  return Fconcat (len * 2 - 1, args);
}

char *

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

  key = EVENT_HEAD (key);

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