(access_keymap): Remove the value 2 for t_ok which was used

for generic chars, which do not exist any more in emacs-unicode.

diff --git a/src/ChangeLog b/src/ChangeLog
index e6b81874bd4e67f55e403ea7935681ee48d3eb5a..e1ef9ffb52ae163796809f54315c7a673cc26b3c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * keymap.c (access_keymap): Remove the value 2 for t_ok which was used
+       for generic chars, which do not exist any more in emacs-unicode.
+
 2008-04-08  Michael Albinus  <michael.albinus@gmx.de>
 
        * coding.c (detect_coding_emacs_mule)

diff --git a/src/keymap.c b/src/keymap.c
index 94d2ab5fe679e63993ff3f109e8ab059bd86f35f..814d9e09a14a19a08e8c2e28a5dc09f161b49598 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -563,9 +563,6 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
 
     GCPRO4 (map, tail, idx, t_binding);
 
-    /* If `t_ok' is 2, both `t' is accepted.  */
-    t_ok = t_ok ? 2 : 0;
-
     for (tail = XCDR (map);
         (CONSP (tail)
          || (tail = get_keymap (tail, 0, autoload), CONSP (tail)));
@@ -587,10 +584,10 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
 
            if (EQ (key, idx))
              val = XCDR (binding);
-           else if (t_ok > 1 && EQ (key, Qt))
+           else if (t_ok && EQ (key, Qt))
              {
                t_binding = XCDR (binding);
-               t_ok = 1;
+               t_ok = 0;
              }
          }
        else if (VECTORP (binding))