From 0e71704b77a9891ccae9f5a9c7429e933078f232 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 27 Apr 2020 19:29:01 +0200 Subject: [PATCH] patch 8.2.0648: semicolon search does not work in first line Problem: Semicolon search does not work in first line. Solution: Allow the cursor to be in line zero. (Christian Brabandt, closes #5996) --- src/ex_docmd.c | 6 ++++-- src/testdir/test_cmdline.vim | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 43cd013..ca69c29 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 7d3c0c8..a547326 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('yes', caught) 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 -- 1.8.3.1