comparison src/keymap.c @ 6008:d3ccce72be00

(get_keyelt): Discard keyboard equivalents stored in a menu keymap element.

6007:4cd71c48281f

	  /* Also remove a menu help string, if any,
	     following the menu item name.  */
	  if (XTYPE (object) == Lisp_Cons
	      && XTYPE (XCONS (object)->car) == Lisp_String)
	    object = XCONS (object)->cdr;
	}

      else
	/* Anything else is really the value.  */
	return object;

ascii_sequence_p (seq)
     Lisp_Object seq;
{
  Lisp_Object i;
  int len = XINT (Flength (seq));
  
  for (XFASTINT (i) = 0; XFASTINT (i) < len; XFASTINT (i)++)
    {
      Lisp_Object elt = Faref (seq, i);

      if (XTYPE (elt) != Lisp_Int
	  || (XUINT (elt) & ~CHAR_META) >= 0x80)
	return 0;
    }

6008:d3ccce72be00

	  /* Also remove a menu help string, if any,
	     following the menu item name.  */
	  if (XTYPE (object) == Lisp_Cons
	      && XTYPE (XCONS (object)->car) == Lisp_String)
	    object = XCONS (object)->cdr;
	  /* Also remove the vector that caches key equivalences, if any.  */
	  if (XTYPE (object) == Lisp_Cons
	      && XTYPE (XCONS (object)->car) == Lisp_Vector)
	    {
	      object = XCONS (object)->cdr;
	      /* Also remove the key's description.  */
	      if (XTYPE (object) == Lisp_Cons
		  && XTYPE (XCONS (object)->car) == Lisp_String)
		object = XCONS (object)->cdr;
	    }
	}

      else
	/* Anything else is really the value.  */
	return object;

ascii_sequence_p (seq)
     Lisp_Object seq;
{
  Lisp_Object i;
  int len = XINT (Flength (seq));

  for (XFASTINT (i) = 0; XFASTINT (i) < len; XFASTINT (i)++)
    {
      Lisp_Object elt;

      elt = Faref (seq, i);

      if (XTYPE (elt) != Lisp_Int
	  || (XUINT (elt) & ~CHAR_META) >= 0x80)
	return 0;
    }