Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: Add SHORT_KEYBIND_DISCARD option
- X-seq: zsh-workers 38233
- From: Mikael Magnusson <mikachu@xxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: PATCH: Add SHORT_KEYBIND_DISCARD option
- Date: Sun, 3 Apr 2016 06:41:54 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=lizaYfBxf7wx3jmXTnQVCO9D1UB09Nxmao9ws5AOE7M=; b=S/Q674Q1Ujp9eCaLEUu4bISNra8i7/t8JAuGXPYSj3+Ixn/ktMEDiAtAqNqkDiNjkJ yXiAIIhC4xCiXIuoL/41Gi/FFoM/nf4YK+965zg7TEs9vPiPlIkS8oNWz4JpnROcDZku 5li6oin2l106gUiMX+FXKH4WfM8D0WBDl/KurYQKeK4dZW9jXorNlFz1uQNy9IXuxg74 i/pG+xQeOU7BUkmRr9gpja6ezDsT/9NlefG+sbYsr9tRb3A5LbeyrM00ePAnqEd8gGFV +yVKSNH5wQowFTC7mCUzLCnT7l+J/fc0dC0EN6tbPjpxIQaVPLMu1oW09ClVpYbmxFu8 SZ7A==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
Not sure how popular this option would be, but I'm fine with keeping
it local too. Basically when we encounter an undefined key, instead
of discarding the entire common prefix, we discard only one byte and
try again. In most particular, it means if you happen to press escape
or ctrl-x before pasting, we still properly detect the bracketed-paste
starting code.
---
Src/Zle/zle_keymap.c | 8 ++++++--
Src/options.c | 1 +
Src/zsh.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index 7b11933..e8de0cd 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1610,8 +1610,12 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)
if (!ispfx)
break;
}
- if(!lastlen && keybuflen)
- lastlen = keybuflen;
+ if(!lastlen && keybuflen) {
+ if (isset(SHORTKEYBINDDISCARD))
+ lastlen = 1;
+ else
+ lastlen = keybuflen;
+ }
else
lastchar = lastc;
if(lastlen != keybuflen) {
diff --git a/Src/options.c b/Src/options.c
index 008ebf1..fa20eb9 100644
--- a/Src/options.c
+++ b/Src/options.c
@@ -248,6 +248,7 @@ static struct optname optns[] = {
{{NULL, "shinstdin", OPT_SPECIAL}, SHINSTDIN},
{{NULL, "shnullcmd", OPT_EMULATE|OPT_BOURNE}, SHNULLCMD},
{{NULL, "shoptionletters", OPT_EMULATE|OPT_BOURNE}, SHOPTIONLETTERS},
+{{NULL, "shortkeybinddiscard",0}, SHORTKEYBINDDISCARD},
{{NULL, "shortloops", OPT_EMULATE|OPT_NONBOURNE},SHORTLOOPS},
{{NULL, "shwordsplit", OPT_EMULATE|OPT_BOURNE}, SHWORDSPLIT},
{{NULL, "singlecommand", OPT_SPECIAL}, SINGLECOMMAND},
diff --git a/Src/zsh.h b/Src/zsh.h
index cbaa351..0dc3248 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -2358,6 +2358,7 @@ enum {
SHNULLCMD,
SHOPTIONLETTERS,
SHORTLOOPS,
+ SHORTKEYBINDDISCARD,
SHWORDSPLIT,
SINGLECOMMAND,
SINGLELINEZLE,
--
2.6.1
Messages sorted by:
Reverse Date,
Date,
Thread,
Author