From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: zsh-workers@zsh.org
Subject: Re: zle: vi mode: wrong undo handling on fresh lines
Date: Sun, 02 Feb 2014 23:10:43 +0100 [thread overview]
Message-ID: <11588.1391379043@thecus.kiddle.eu> (raw)
In-Reply-To: <2700.1390950035@thecus.kiddle.eu>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2418 bytes --]
On 29 Jan, I wrote:
> If someone has the overstrike option set, it should probably be 'R'.
> Actually that option seems to be fully non-working for vi mode.
It seems overstrike in vi mode is something we only just broke. This
fixes it. Also, having collectively put some thought into what the
synthesised vi command should be when repeating the first change, I
thought it'd be a waste not to do something – even though it is a
feature that nobody has ever missed. This uses 'o' for blank lines,
mainly because it is the most useful, 'R' if overstrike is set, 'a' if
the cursor is at the end of a non-blank line and 'i' otherwise.
Oliver
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index ed8577b..b0010fc 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1198,14 +1198,6 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish)
statusline = NULL;
selectkeymap("main", 1);
initundo();
- /*
- * If main is linked to the viins keymap, we need to register
- * explicitly that we're now in vi insert mode as there's
- * no user operation to indicate this.
- */
- if (openkeymap("main") == openkeymap("viins"))
- viinsert_init();
- selectlocalmap(NULL);
fixsuffix();
if ((s = getlinknode(bufstack))) {
setline(s, ZSL_TOEND);
@@ -1222,6 +1214,14 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish)
stackhist = -1;
}
}
+ /*
+ * If main is linked to the viins keymap, we need to register
+ * explicitly that we're now in vi insert mode as there's
+ * no user operation to indicate this.
+ */
+ if (openkeymap("main") == openkeymap("viins"))
+ viinsert_init();
+ selectlocalmap(NULL);
if (isset(PROMPTCR))
putc('\r', shout);
if (tmout)
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
index 79b8cb9..994b44f 100644
--- a/Src/Zle/zle_vi.c
+++ b/Src/Zle/zle_vi.c
@@ -79,8 +79,9 @@ static void
startvichange(int im)
{
if (im != -1) {
- insmode = im;
vichgflag = 1;
+ if (im > -1)
+ insmode = im;
}
if (inrepeat && im != -2) {
zmod = lastmod;
@@ -92,7 +93,8 @@ startvichange(int im)
free(vichgbuf);
vichgbuf = (char *)zalloc(vichgbufsz = 16);
if (im == -2) {
- vichgbuf[0] = 'a';
+ vichgbuf[0] =
+ zlell ? (insmode ? (zlecs < zlell ? 'i' : 'a') : 'R') : 'o';
} else {
vichgbuf[0] = lastchar;
}
next prev parent reply other threads:[~2014-02-02 22:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-22 12:37 Hauke Petersen
2013-09-22 18:24 ` Bart Schaefer
2013-09-22 20:27 ` Hauke Petersen
2013-09-23 4:57 ` Bart Schaefer
2013-09-23 20:30 ` Peter Stephenson
2014-01-24 23:19 ` Oliver Kiddle
2014-01-25 19:15 ` Bart Schaefer
2014-01-27 12:43 ` Peter Stephenson
2014-01-27 16:11 ` Peter Stephenson
2014-01-28 14:58 ` Peter Stephenson
2014-01-28 16:28 ` Bart Schaefer
2014-01-28 16:47 ` Peter Stephenson
2014-01-28 17:41 ` Bart Schaefer
2014-01-28 23:00 ` Oliver Kiddle
2014-01-29 2:59 ` Bart Schaefer
2014-01-29 10:50 ` Oliver Kiddle
2014-01-29 14:48 ` Bart Schaefer
2014-01-30 14:51 ` Jun T.
2014-01-30 15:38 ` Peter Stephenson
2014-01-30 16:03 ` Bart Schaefer
2014-01-31 12:00 ` Jun T.
2014-01-31 15:19 ` Bart Schaefer
2014-01-31 15:33 ` Peter Stephenson
[not found] ` <16181.1391175951@thecus.kiddle.eu>
2014-01-31 16:43 ` Jun T.
2014-01-31 21:37 ` Oliver Kiddle
2014-01-31 22:32 ` Oliver Kiddle
2014-02-01 19:27 ` Bart Schaefer
2014-02-03 16:20 ` Jun T.
2014-02-03 21:29 ` Oliver Kiddle
2014-02-03 22:20 ` Bart Schaefer
2014-02-03 23:26 ` Oliver Kiddle
2014-02-04 17:11 ` Jun T.
2014-02-05 22:00 ` Oliver Kiddle
2014-02-02 22:10 ` Oliver Kiddle [this message]
2014-02-07 14:43 ` Oliver Kiddle
2014-02-07 16:22 ` Bart Schaefer
2014-01-27 16:29 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11588.1391379043@thecus.kiddle.eu \
--to=okiddle@yahoo.co.uk \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).