diff options
| author | Oliver Kiddle <opk@zsh.org> | 2014-10-24 00:18:32 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2014-10-24 00:18:32 +0200 |
| commit | 746b53d5d7792ebb63b638116973f32fc492787a (patch) | |
| tree | ec8c92f4e8c7e14e36f29157c454377602314469 | |
| parent | bd6f119942bae2c3e914cabbb69624884ab1bc79 (diff) | |
| download | zsh-746b53d5d7792ebb63b638116973f32fc492787a.tar.gz zsh-746b53d5d7792ebb63b638116973f32fc492787a.zip | |
33520: correct cursor positioning following a vi mode yank operation
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/zle_vi.c | 9 | ||||
| -rw-r--r-- | Test/X02zlevi.ztst | 22 |
3 files changed, 33 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2014-10-23 Oliver Kiddle <opk@zsh.org> + * 33520: Src/Zle/zle_vi.c, Test/X02zlevi.ztst: correct cursor + positioning following a vi mode yank operation + * unposted: .editorconfig: specify 8 char indent for ChangeLog * 33519: Src/Zle/zle_move.c, Test/X02zlevi.ztst: last character diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c index 20cece0a8..53919e361 100644 --- a/Src/Zle/zle_vi.c +++ b/Src/Zle/zle_vi.c @@ -457,7 +457,14 @@ viyank(UNUSED(char **args)) ret = 0; } vichgflag = 0; - zlecs = oldcs; + /* cursor now at the start of the range yanked. For line mode + * restore the column position */ + if (vilinerange) { + while (oldcs > 0 && zleline[oldcs - 1] != ZWC('\n') && + zlecs != zlell && zleline[zlecs] != ZWC('\n')) { + ++zlecs; --oldcs; + } + } return ret; } diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst index b4426a8fb..d9fa0d51f 100644 --- a/Test/X02zlevi.ztst +++ b/Test/X02zlevi.ztst @@ -15,6 +15,28 @@ >BUFFER: good >CURSOR: 4 + zletest $'one two\eyb' +0:yank left moves the cursor +>BUFFER: one two +>CURSOR: 4 + + zletest $'one two\e0ye' +0:yank right leaves the cursor +>BUFFER: one two +>CURSOR: 0 + + zletest $'short\eoand longer\eyk' +0:yank up line moves cursor up but not to buffer start +>BUFFER: short +>and longer +>CURSOR: 4 + + zletest $'one\eotwo\ekyj' +0:yank down line leaves the cursor +>BUFFER: one +>two +>CURSOR: 2 + zletest $'yankee doodle\ebhDyy0"1P' 0:paste register 1 to get last deletion >BUFFER: doodleyankee |