diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/zle_keymap.c | 25 |
2 files changed, 16 insertions, 12 deletions
@@ -1,5 +1,8 @@ 2023-02-17 Oliver Kiddle <opk@zsh.org> + * 51447: Src/Zle/zle_keymap.c: silence compiler maybe-uninitialized + warning by combining a couple of variables + * Øystein Walle: 51391: Completion/Unix/Command/_git: complete remote branch names respecting --delete for git push diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c index ec8dd031e..a31ab22d7 100644 --- a/Src/Zle/zle_keymap.c +++ b/Src/Zle/zle_keymap.c @@ -1586,7 +1586,7 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp) Thingy func = t_undefinedkey; char *str = NULL; int lastlen = 0, lastc = lastchar; - int timeout = 0, csi = 0, startcsi; + int timeout = 0, csi = 0; keybuflen = 0; keybuf[0] = 0; @@ -1640,22 +1640,23 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp) /* CSI key sequences have a well defined structure so if we currently * have an incomplete one, loop so the rest of it will be included in * the key sequence if that arrives within the timeout. */ - if (keybuflen >= 3 && !csi) { - startcsi = keybuflen - 3; - csi = keybuf[startcsi] == '\033' && keybuf[keybuflen - 2] == '['; - } + if (!csi && keybuflen >= 3 && keybuf[keybuflen - 3] == '\033' && + keybuf[keybuflen - 2] == '[') + csi = keybuflen - 1; if (csi) { - csi = keybuf[keybuflen - 2] != Meta && keybuf[keybuflen - 1] >= 0x20 - && keybuf[keybuflen - 1] <= 0x3f; + if (keybuf[keybuflen - 2] == Meta || keybuf[keybuflen - 1] < 0x20 + || keybuf[keybuflen - 1] > 0x3f) { /* If we reach the end of a valid CSI sequence and the matched key * binding is for part of the CSI introduction, select instead the * undefined-key widget and consume the full sequence from the * input buffer. */ - if (!csi && keybuf[keybuflen - 1] >= 0x40 && - keybuf[keybuflen - 1] <= 0x7e && lastlen > startcsi && - lastlen <= startcsi + 2) { - func = t_undefinedkey; - lastlen = keybuflen; + if (keybuf[keybuflen - 1] >= 0x40 && + keybuf[keybuflen - 1] <= 0x7e && lastlen > csi - 2 && + lastlen <= csi) { + func = t_undefinedkey; + lastlen = keybuflen; + } + csi = 0; } } |