diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2014-01-28 19:13:39 -0800 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-01-28 19:13:39 -0800 |
commit | 8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c (patch) | |
tree | 9c8b60e4f8acefdab3045f9d656b8cfd804399c6 /Src/Zle/zle_vi.c | |
parent | a2098b0b26b47917cc725b387c63d75dfe0098f2 (diff) | |
parent | 584ea888115e48da43b01b5f5a7e1511a469f081 (diff) | |
download | zsh-8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c.tar.gz zsh-8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c.tar.xz zsh-8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c.zip |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
Diffstat (limited to 'Src/Zle/zle_vi.c')
-rw-r--r-- | Src/Zle/zle_vi.c | 27 |
1 files changed, 25 insertions, 2 deletions
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)) |