diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-01-28 16:12:41 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-01-28 16:12:41 +0000 |
| commit | c56f5aed59a4460d2382ce02eddd0948cab94b17 (patch) | |
| tree | 3f017a07ab6ca0fac75c7e936e10d9d3d0f53837 /Src/Zle | |
| parent | a0c9da72f2625ac79648add48262532ddff2166d (diff) | |
| download | zsh-c56f5aed59a4460d2382ce02eddd0948cab94b17.tar.gz zsh-c56f5aed59a4460d2382ce02eddd0948cab94b17.tar.xz zsh-c56f5aed59a4460d2382ce02eddd0948cab94b17.zip | |
32308: Improve initialising of vi change.
Better handling when entering viins on entry to editor. Slightly changed since post to use vi command a.
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/zle_main.c | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_vi.c | 27 |
2 files changed, 26 insertions, 3 deletions
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 040b7cb83..a2b20df25 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1204,7 +1204,7 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish) * no user operation to indicate this. */ if (openkeymap("main") == openkeymap("viins")) - viinsert(NULL); + viinsert_init(); selectlocalmap(NULL); fixsuffix(); if ((s = getlinknode(bufstack))) { diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c index 173a49ef9..31f293387 100644 --- a/Src/Zle/zle_vi.c +++ b/Src/Zle/zle_vi.c @@ -67,6 +67,13 @@ int viinsbegin; static struct modifier lastmod; static int inrepeat, vichgrepeat; +/** + * im: >= 0: is an insertmode + * -1: skip setting insert mode + * -2: entering viins at start of editing from clean --- don't use + * inrepeat or lastchar, synthesise an i to enter insert mode. + */ + /**/ static void startvichange(int im) @@ -75,7 +82,7 @@ startvichange(int im) insmode = im; vichgflag = 1; } - if (inrepeat) { + if (inrepeat && im != -2) { zmod = lastmod; inrepeat = vichgflag = 0; vichgrepeat = 1; @@ -84,7 +91,11 @@ startvichange(int im) if (vichgbuf) free(vichgbuf); vichgbuf = (char *)zalloc(vichgbufsz = 16); - vichgbuf[0] = lastchar; + if (im == -2) { + vichgbuf[0] = 'a'; + } else { + vichgbuf[0] = lastchar; + } vichgbufptr = 1; vichgrepeat = 0; } @@ -303,6 +314,18 @@ viinsert(UNUSED(char **args)) return 0; } +/* + * Go to vi insert mode when we first start the line editor. + * Iniialises some other stuff. + */ + +/**/ +void +viinsert_init(void) +{ + startvitext(-2); +} + /**/ int viinsertbol(UNUSED(char **args)) |