Commit ffab2bd6 authored by Richard M. Stallman's avatar Richard M. Stallman

(get_keyelt): Discard keyboard equivalents

stored in a menu keymap element.
parent fa6d54d9
...@@ -371,6 +371,16 @@ get_keyelt (object) ...@@ -371,6 +371,16 @@ get_keyelt (object)
if (XTYPE (object) == Lisp_Cons if (XTYPE (object) == Lisp_Cons
&& XTYPE (XCONS (object)->car) == Lisp_String) && XTYPE (XCONS (object)->car) == Lisp_String)
object = XCONS (object)->cdr; 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 else
...@@ -1441,10 +1451,12 @@ ascii_sequence_p (seq) ...@@ -1441,10 +1451,12 @@ ascii_sequence_p (seq)
{ {
Lisp_Object i; Lisp_Object i;
int len = XINT (Flength (seq)); int len = XINT (Flength (seq));
for (XFASTINT (i) = 0; XFASTINT (i) < len; XFASTINT (i)++) for (XFASTINT (i) = 0; XFASTINT (i) < len; XFASTINT (i)++)
{ {
Lisp_Object elt = Faref (seq, i); Lisp_Object elt;
elt = Faref (seq, i);
if (XTYPE (elt) != Lisp_Int if (XTYPE (elt) != Lisp_Int
|| (XUINT (elt) & ~CHAR_META) >= 0x80) || (XUINT (elt) & ~CHAR_META) >= 0x80)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment