mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-27 04:40:59 +01:00
Code Releases Activity

21770: tweak 21760 to avoid conflicts with global bindings

Browse source
This commit is contained in:
Bart Schaefer 2005-09-29 14:39:18 +00:00
parent 5d6995abb1
commit 6183db6faa
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -17,6 +17,12 @@
* 21778: Completion/Debian/Command/_piuparts: completion for * 21778: Completion/Debian/Command/_piuparts: completion for
piuparts. 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> 2005-09-27 Peter Stephenson <pws@csr.com>
* 21769: Src/utils.c, Src/Zle/complist.c: fix some consequences of * 21769: Src/utils.c, Src/Zle/complist.c: fix some consequences of

5
Src/Zle/zle_keymap.c
View file

@ -1300,10 +1300,9 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)
loc = ((f = keybind(localkeymap, keybuf, &s)) != t_undefinedkey); loc = ((f = keybind(localkeymap, keybuf, &s)) != t_undefinedkey);
ispfx = keyisprefix(localkeymap, keybuf); ispfx = keyisprefix(localkeymap, keybuf);
} }
if (!loc && !ispfx) { if (!loc)
f = keybind(km, keybuf, &s); f = keybind(km, keybuf, &s);
ispfx = keyisprefix(km, keybuf); ispfx |= keyisprefix(km, keybuf);
}
if (f != t_undefinedkey) { if (f != t_undefinedkey) {
lastlen = keybuflen; lastlen = keybuflen;