diff options
author | Oliver Kiddle <opk@zsh.org> | 2014-10-30 21:52:18 +0100 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2014-10-30 21:52:36 +0100 |
commit | fd302c9837b0034962471b9288b182e2525ba1d8 (patch) | |
tree | 9b47d9b32d8612077b25aeb5ea937725c8946b70 /Src/Zle/zle_vi.c | |
parent | 9d2cfa7af6b8973e13716f7c36f7fb156e3348dd (diff) | |
download | zsh-fd302c9837b0034962471b9288b182e2525ba1d8.tar.gz zsh-fd302c9837b0034962471b9288b182e2525ba1d8.tar.xz zsh-fd302c9837b0034962471b9288b182e2525ba1d8.zip |
33570, 33576: make killring/yank-pop work in vi mode after
vi-put-before and vi-put-after
Diffstat (limited to 'Src/Zle/zle_vi.c')
-rw-r--r-- | Src/Zle/zle_vi.c | 68 |
1 files changed, 1 insertions, 67 deletions
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c index 0a8b27d65..b0e696b62 100644 --- a/Src/Zle/zle_vi.c +++ b/Src/Zle/zle_vi.c @@ -75,7 +75,7 @@ static int inrepeat, vichgrepeat; */ /**/ -static void +void startvichange(int im) { if (im != -1) { @@ -793,72 +793,6 @@ vikillline(UNUSED(char **args)) /**/ int -viputbefore(UNUSED(char **args)) -{ - Cutbuffer buf = &cutbuf; - int n = zmult; - - startvichange(-1); - if (n < 0 || zmod.flags & MOD_NULL) - return 1; - if (zmod.flags & MOD_VIBUF) - buf = &vibuf[zmod.vibuf]; - if (!buf->buf) - return 1; - if(buf->flags & CUTBUFFER_LINE) { - zlecs = findbol(); - spaceinline(buf->len + 1); - ZS_memcpy(zleline + zlecs, buf->buf, buf->len); - zleline[zlecs + buf->len] = ZWC('\n'); - vifirstnonblank(zlenoargs); - } else { - while (n--) { - spaceinline(buf->len); - ZS_memcpy(zleline + zlecs, buf->buf, buf->len); - zlecs += buf->len; - } - if (zlecs) - DECCS(); - } - return 0; -} - -/**/ -int -viputafter(UNUSED(char **args)) -{ - Cutbuffer buf = &cutbuf; - int n = zmult; - - startvichange(-1); - if (n < 0 || zmod.flags & MOD_NULL) - return 1; - if (zmod.flags & MOD_VIBUF) - buf = &vibuf[zmod.vibuf]; - if (!buf->buf) - return 1; - if(buf->flags & CUTBUFFER_LINE) { - zlecs = findeol(); - spaceinline(buf->len + 1); - zleline[zlecs++] = ZWC('\n'); - ZS_memcpy(zleline + zlecs, buf->buf, buf->len); - vifirstnonblank(zlenoargs); - } else { - if (zlecs != findeol()) - INCCS(); - while (n--) { - spaceinline(buf->len); - ZS_memcpy(zleline + zlecs, buf->buf, buf->len); - zlecs += buf->len; - } - if (zlecs) - DECCS(); - } - return 0; -} - -/**/ -int vijoin(UNUSED(char **args)) { int x, pos; |