aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorStefan Monnier2008-04-08 22:13:13 +0000
committerStefan Monnier2008-04-08 22:13:13 +0000
commit84cb7b4562d2075284f15bcc832d156d0cf0d71a (patch)
tree52757f4d56d739d4cfa4c8cdbe519e24bb5c4e60 /src/keymap.c
parentb4f9af73de11eed426bfe5b49f7add50fb94ee81 (diff)
downloademacs-84cb7b4562d2075284f15bcc832d156d0cf0d71a.tar.gz
emacs-84cb7b4562d2075284f15bcc832d156d0cf0d71a.zip
(access_keymap): Remove the value 2 for t_ok which was used
for generic chars, which do not exist any more in emacs-unicode.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 94d2ab5fe67..814d9e09a14 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -563,9 +563,6 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
563 563
564 GCPRO4 (map, tail, idx, t_binding); 564 GCPRO4 (map, tail, idx, t_binding);
565 565
566 /* If `t_ok' is 2, both `t' is accepted. */
567 t_ok = t_ok ? 2 : 0;
568
569 for (tail = XCDR (map); 566 for (tail = XCDR (map);
570 (CONSP (tail) 567 (CONSP (tail)
571 || (tail = get_keymap (tail, 0, autoload), CONSP (tail))); 568 || (tail = get_keymap (tail, 0, autoload), CONSP (tail)));
@@ -587,10 +584,10 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
587 584
588 if (EQ (key, idx)) 585 if (EQ (key, idx))
589 val = XCDR (binding); 586 val = XCDR (binding);
590 else if (t_ok > 1 && EQ (key, Qt)) 587 else if (t_ok && EQ (key, Qt))
591 { 588 {
592 t_binding = XCDR (binding); 589 t_binding = XCDR (binding);
593 t_ok = 1; 590 t_ok = 0;
594 } 591 }
595 } 592 }
596 else if (VECTORP (binding)) 593 else if (VECTORP (binding))