thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.0.0133

Browse Source 
Problem:    "2;'(" causes ml_get errors in an empty buffer.  (Dominique Pelle)
Solution:   Check the cursor line earlier.
This commit is contained in:
Bram Moolenaar 2016-12-11 21:34:23 +01:00
parent 4c8980b717
commit fe38b494ff
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ex_docmd.c
View File

@ -2277,7 +2277,11 @@ do_one_cmd(
if (*ea.cmd == ';') if (*ea.cmd == ';')
{ {
if (!ea.skip) if (!ea.skip)
{
curwin->w_cursor.lnum = ea.line2; curwin->w_cursor.lnum = ea.line2;
/* don't leave the cursor on an illegal line */
check_cursor_lnum();
}
} }
else if (*ea.cmd != ',') else if (*ea.cmd != ',')
break; break;
@ -2293,9 +2297,6 @@ do_one_cmd(
ea.addr_count = 0; ea.addr_count = 0;
} }
/* Don't leave the cursor on an illegal line (caused by ';') */
check_cursor_lnum();
/* /*
* 5. Parse the command. * 5. Parse the command.
*/ */

7
src/testdir/test_cmdline.vim
View File

@ -234,3 +234,10 @@ func Test_remove_char_in_cmdline()
call feedkeys(":abc def\<S-Left>\<C-U>\<C-B>\"\<CR>", 'tx') call feedkeys(":abc def\<S-Left>\<C-U>\<C-B>\"\<CR>", 'tx')
call assert_equal('"def', @:) call assert_equal('"def', @:)
endfunc endfunc
func Test_illegal_address()
new
2;'(
2;')
quit
endfunc

2
src/version.c
View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
133,
/**/ /**/
132, 132,
/**/ /**/