mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00
Code Issues Projects Releases Wiki Activity

(access_keymap): Fix last change to not consider

Browse source 
IDX when it has modifiers.
This commit is contained in:
Gerd Moellmann 2001-08-22 08:29:20 +00:00
parent efeb796b01
commit 62b366ffb3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/keymap.c
View file

@ -537,7 +537,9 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
return get_keyelt (val, autoload);
}
else if (INTEGERP (idx)
&& (XINT (idx) & CHAR_MODIFIER_MASK) == 0
&& INTEGERP (key)
&& (XINT (key) & CHAR_MODIFIER_MASK) == 0
&& !SINGLE_BYTE_CHAR_P (XINT (idx))
&& !SINGLE_BYTE_CHAR_P (XINT (key))
&& CHAR_VALID_P (XINT (key), 1)
@ -571,9 +573,7 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
are not included in a char-table.
All character codes without modifiers are included. */
if (NATNUMP (idx)
&& ! (XFASTINT (idx)
& (CHAR_ALT | CHAR_SUPER | CHAR_HYPER
| CHAR_SHIFT | CHAR_CTL | CHAR_META)))
&& (XFASTINT (idx) & CHAR_MODIFIER_MASK) == 0)
{
val = Faref (binding, idx);
if (noprefix && KEYMAPP (val))