diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-27 19:29:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-27 19:29:01 +0200 |
| commit | 0e71704b77a9891ccae9f5a9c7429e933078f232 (patch) | |
| tree | c3df6e09c6c66d36a7bcfbd61dad3356b41537e1 | |
| parent | bc970da80735bfd49c238cdf4bbc60c04dc12e0f (diff) | |
| download | vim-git-0e71704b77a9891ccae9f5a9c7429e933078f232.tar.gz | |
patch 8.2.0648: semicolon search does not work in first linev8.2.0648
Problem: Semicolon search does not work in first line.
Solution: Allow the cursor to be in line zero. (Christian Brabandt,
closes #5996)
| -rw-r--r-- | src/ex_docmd.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 43cd013e2..ca69c293d 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3069,8 +3069,10 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) if (!eap->skip) { curwin->w_cursor.lnum = eap->line2; - // don't leave the cursor on an illegal line or column - check_cursor(); + // Don't leave the cursor on an illegal line or column, but do + // accept zero as address, so 0;/PATTERN/ works correctly. + if (eap->line2 > 0) + check_cursor(); } } else if (*eap->cmd != ',') diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 7d3c0c87d..a5473267d 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1471,4 +1471,15 @@ func Test_cmdwin_insert_mode_close() call assert_equal(1, winnr('$')) endfunc +" test that ";" works to find a match at the start of the first line +func Test_zero_line_search() + new + call setline(1, ["1, pattern", "2, ", "3, pattern"]) + call cursor(1,1) + 0;/pattern/d + call assert_equal(["2, ", "3, pattern"], getline(1,'$')) + q! +endfunc + + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 9323b1d09..a9a2e293e 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 648, +/**/ 647, /**/ 646, |