comparison src/keyboard.c @ 112082:5a77e1764c9e

merge emacs-23

112067:5834722132ce

    Lisp_Object keyeq = AREF (item_properties, ITEM_PROPERTY_KEYEQ);

    /* The previous code preferred :key-sequence to :keys, so we
       preserve this behavior.  */
    if (STRINGP (keyeq) && !CONSP (keyhint))
      keyeq = Fsubstitute_command_keys (keyeq);
    else
      {
	Lisp_Object prefix = keyeq;
	Lisp_Object keys = Qnil;

112082:5a77e1764c9e

    Lisp_Object keyeq = AREF (item_properties, ITEM_PROPERTY_KEYEQ);

    /* The previous code preferred :key-sequence to :keys, so we
       preserve this behavior.  */
    if (STRINGP (keyeq) && !CONSP (keyhint))
      keyeq = concat2 (build_string ("  "), Fsubstitute_command_keys (keyeq));
    else
      {
	Lisp_Object prefix = keyeq;
	Lisp_Object keys = Qnil;