Mercurial > vim
changeset 12996:973a0037f4c3 v8.0.1374
patch 8.0.1374: CTRL-A does not work with an empty line
commit https://github.com/vim/vim/commit/5fe6bdf858a7f2f288d599ffb5efb3c08449c817
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 5 17:22:12 2017 +0100
patch 8.0.1374: CTRL-A does not work with an empty line
Problem: CTRL-A does not work with an empty line. (Alex)
Solution: Decrement the end only once. (Hirohito Higashi, closes https://github.com/vim/vim/issues/2387)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 05 Dec 2017 17:30:05 +0100 |
| parents | 814c18a298a9 |
| children | f0c85ce3dd06 |
| files | src/ops.c src/testdir/test_increment.vim src/version.c |
| diffstat | 3 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -5433,7 +5433,7 @@ op_addsub( } else /* oap->motion_type == MCHAR */ { - if (!oap->inclusive) + if (pos.lnum == oap->start.lnum && !oap->inclusive) dec(&(oap->end)); length = (colnr_T)STRLEN(ml_get(pos.lnum)); pos.col = 0;
--- a/src/testdir/test_increment.vim +++ b/src/testdir/test_increment.vim @@ -364,11 +364,25 @@ endfunc " Expected: " 1) Ctrl-a on visually selected zero " 111 +" +" Also: 019 with "01" selected increments to "029". func Test_visual_increment_15() call setline(1, ["101"]) exec "norm! lv\<C-A>" call assert_equal(["111"], getline(1, '$')) call assert_equal([0, 1, 2, 0], getpos('.')) + + call setline(1, ["019"]) + exec "norm! 0vl\<C-A>" + call assert_equal("029", getline(1)) + + call setline(1, ["01239"]) + exec "norm! 0vlll\<C-A>" + call assert_equal("01249", getline(1)) + + call setline(1, ["01299"]) + exec "norm! 0vlll\<C-A>" + call assert_equal("1309", getline(1)) endfunc " 16) increment right aligned numbers @@ -756,5 +770,12 @@ func Test_normal_increment_03() call assert_equal([0, 3, 25, 0], getpos('.')) endfunc +func Test_increment_empty_line() + new + call setline(1, ['0', '0', '0', '0', '0', '0', '']) + exe "normal Gvgg\<C-A>" + call assert_equal(['1', '1', '1', '1', '1', '1', ''], getline(1, 7)) + bwipe! +endfunc " vim: shiftwidth=2 sts=2 expandtab