# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1207692793 0
# Node ID 9eaa3ee184e9a41f25b7232cd6863e1c825e2a1b
# Parent  c0fe31fb38335537397ce497a83dfa861d37feb4
(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 -r c0fe31fb3833 -r 9eaa3ee184e9 src/ChangeLog
--- a/src/ChangeLog	Tue Apr 08 22:12:12 2008 +0000
+++ b/src/ChangeLog	Tue Apr 08 22:13:13 2008 +0000
@@ -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 -r c0fe31fb3833 -r 9eaa3ee184e9 src/keymap.c
--- a/src/keymap.c	Tue Apr 08 22:12:12 2008 +0000
+++ b/src/keymap.c	Tue Apr 08 22:13:13 2008 +0000
@@ -563,9 +563,6 @@
 
     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 @@
 
 	    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))