about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/Zle/zle_keymap.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eb1a48d70..35cf2ddd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,12 @@
 	* 21778: Completion/Debian/Command/_piuparts: completion for
 	piuparts.
  
+2005-09-27  Bart Schaefer  <schaefer@zsh.org>
+
+	* 21770: Src/Zle/zle_keymap.c: tweak 21760 so binding XYA in a
+	local keymap does not prevent bindings X or XY in the global
+	keymap from being chosen (upon key timeout).
+
 2005-09-27  Peter Stephenson  <pws@csr.com>
 
 	* 21769: Src/utils.c, Src/Zle/complist.c: fix some consequences of
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index de1d918ba..3045eddd8 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1300,10 +1300,9 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)
 	    loc = ((f = keybind(localkeymap, keybuf, &s)) != t_undefinedkey);
 	    ispfx = keyisprefix(localkeymap, keybuf);
 	}
-	if (!loc && !ispfx) {
+	if (!loc)
 	    f = keybind(km, keybuf, &s);
-	    ispfx = keyisprefix(km, keybuf);
-	}
+	ispfx |= keyisprefix(km, keybuf);
 
 	if (f != t_undefinedkey) {
 	    lastlen = keybuflen;