diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-04-17 10:23:58 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-04-17 10:23:58 +0100 |
| commit | 4508d25710de08793005923b1f91f5ae072f3945 (patch) | |
| tree | a7000951ba4226ecc1078408db3d04d0f35e72bc /Src/Zle/zle_keymap.c | |
| parent | ccb1cf2d10aa674caf2aa73599110aed1127ad26 (diff) | |
| download | zsh-4508d25710de08793005923b1f91f5ae072f3945.tar.gz zsh-4508d25710de08793005923b1f91f5ae072f3945.tar.xz zsh-4508d25710de08793005923b1f91f5ae072f3945.zip | |
34905: no parse error after keyboard interrupt.
Handled generally, though only showing up in special nested cases. Also fix ZLE so it doesn't cancel the interrupt flag when not actually returning from a local keymap.
Diffstat (limited to 'Src/Zle/zle_keymap.c')
| -rw-r--r-- | Src/Zle/zle_keymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c index cfef88217..c6fae251d 100644 --- a/Src/Zle/zle_keymap.c +++ b/Src/Zle/zle_keymap.c @@ -503,8 +503,9 @@ selectkeymap(char *name, int fb) mod_export void selectlocalmap(Keymap m) { + Keymap oldm = localkeymap; localkeymap = m; - if (!m) + if (oldm && !m) { /* * No local keymap; so we are returning to the global map. If |