diff options
author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-12-07 16:24:19 +0000 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2014-12-11 09:41:17 +0000 |
commit | d067ebcacd55472f720b2765ec686a69b25c9a90 (patch) | |
tree | c22b23a3812456939b9cf284c6ccba1249636443 /Src/Zle/zle_keymap.c | |
parent | 247f7548dc760184dae090834d4a050f4ce32d98 (diff) | |
download | zsh-d067ebcacd55472f720b2765ec686a69b25c9a90.tar.gz zsh-d067ebcacd55472f720b2765ec686a69b25c9a90.tar.xz zsh-d067ebcacd55472f720b2765ec686a69b25c9a90.zip |
33876: etc.: Separate errors and keyboards interrupts
Combination of 12 commits from interrupt_abort branch. Basic strategy is to introduce bits to errflag and to set and reset them separately. Remove interrupt status on return to main keymap. Turn off ERRFLAG_INT for always block. Restore bit thereafter: we probably need a new variable in order to allow user interrupts to be reset in the always block. Add TRY_BLOCK_INTERRUPT This works the same as TRY_BLOCK_ERROR, but for a SIGINT, too. Ensure propagation of SIGINT from exited job. If received by foreground job, shell uses ERRFLAG_INT, not ERRFLAG_ERROR, to set the new state. Reset errflag before precmd() Add always block in _main_completion to fix ZLS_COLORS Ensures we get the right state of $ZLS_COLORS at the end of _main_complete even if there's an interrupt. However, the "right state" is a bit messy as it depends on styles.
Diffstat (limited to 'Src/Zle/zle_keymap.c')
-rw-r--r-- | Src/Zle/zle_keymap.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c index 30d25ebaa..48f210c7e 100644 --- a/Src/Zle/zle_keymap.c +++ b/Src/Zle/zle_keymap.c @@ -504,6 +504,16 @@ mod_export void selectlocalmap(Keymap m) { localkeymap = m; + if (!m) + { + /* + * No local keymap; so we are returning to the global map. If + * the user ^Ced in the local map, they probably just want to go + * back to normal editing. So remove the interrupt error + * status. + */ + errflag &= ~ERRFLAG_INT; + } } /* Reopen the currently selected keymap, in case it got deleted. This * |