diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-24 13:57:26 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-24 23:28:59 +0100 |
| commit | 0439e808cb0ca999218f8a466e4a9a57113f4e0c (patch) | |
| tree | b9fe7f4ad60c279a9d03af11397a9df1814de735 | |
| parent | f13b90c064e817664f48bb7f0ce3e69cd54943c7 (diff) | |
| download | rneovim-0439e808cb0ca999218f8a466e4a9a57113f4e0c.tar.gz rneovim-0439e808cb0ca999218f8a466e4a9a57113f4e0c.tar.bz2 rneovim-0439e808cb0ca999218f8a466e4a9a57113f4e0c.zip | |
vim-patch:7.4.521
Problem: When using "vep" a mark is moved to the next line. (Maxi Padulo,
Issue 283)
Solution: Decrement the line number. (Christian Brabandt)
https://code.google.com/p/vim/source/detail?r=v7-4-521
| -rw-r--r-- | src/nvim/ops.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 931b877a95..9b33b6732c 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -2979,9 +2979,11 @@ do_put ( } if (VIsual_active) lnum++; - } while ( - VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum - ); + } while (VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum); + + if (VIsual_active) { /* reset lnum to the last visual line */ + lnum--; + } curbuf->b_op_end = curwin->w_cursor; /* For "CTRL-O p" in Insert mode, put cursor after last char */ diff --git a/src/nvim/version.c b/src/nvim/version.c index b469d0e804..dc7c62305a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -217,7 +217,7 @@ static int included_patches[] = { //524, //523 NA //522, - //521, + 521, 520, //519, 518, |