aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0582: Printed line doesn't overwrite colon when pressing Enter in Ex mode

Browse Source 
Problem:  Printed line no longer overwrites colon when pressing Enter in
          Ex mode (after 9.1.0573).
Solution: Restore the behavior of pressing Enter in Ex mode.
          (zeertzjq)

closes: #15258

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-07-14 10:22:54 +02:00 committed by Christian Brabandt
parent d9be94cf03
commit 7d664bf0eb
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ex_docmd.c
View File

@ -2721,6 +2721,12 @@ ex_errmsg(char *msg, char_u *arg)
return ex_error_buf;
}
/*
* The "+" string used in place of an empty command in Ex mode.
* This string is used in pointer comparison.
*/
static char exmode_plus[] = "+";
/*
* Handle a range without a command.
* Returns an error message on failure.
@ -2730,7 +2736,8 @@ ex_range_without_command(exarg_T *eap)
{
char *errormsg = NULL;
if ((*eap->cmd == '|' || exmode_active)
if ((*eap->cmd == '|' ||
(exmode_active && eap->cmd != (char_u *)exmode_plus + 1))
#ifdef FEAT_EVAL
&& !in_vim9script()
#endif
@ -3212,7 +3219,7 @@ parse_command_modifiers(
eap->cmd = orig_cmd;
}
else if (use_plus_cmd)
eap->cmd = (char_u *)"+";
eap->cmd = (char_u *)exmode_plus;
return OK;
}

12
src/testdir/test_ex_mode.vim
View File

@ -68,7 +68,7 @@ func Test_Ex_substitute()
CheckRunVimInTerminal
let buf = RunVimInTerminal('', {'rows': 6})
call term_sendkeys(buf, ":call setline(1, ['foo foo', 'foo foo', 'foo foo'])\<CR>")
call term_sendkeys(buf, ":call setline(1, repeat(['foo foo'], 4))\<CR>")
call term_sendkeys(buf, ":set number\<CR>")
call term_sendkeys(buf, "gQ")
call WaitForAssert({-> assert_match(':', term_getline(buf, 6))}, 1000)
@ -90,8 +90,14 @@ func Test_Ex_substitute()
" Pressing enter in ex mode should print the current line
call term_sendkeys(buf, "\<CR>")
call WaitForAssert({-> assert_match(' 3 foo foo',
\ term_getline(buf, 5))}, 1000)
call WaitForAssert({-> assert_match(' 3 foo foo', term_getline(buf, 5))}, 1000)
call WaitForAssert({-> assert_match(':', term_getline(buf, 6))}, 1000)
" The printed line should overwrite the colon
call term_sendkeys(buf, "\<CR>")
call WaitForAssert({-> assert_match(' 3 foo foo', term_getline(buf, 4))}, 1000)
call WaitForAssert({-> assert_match(' 4 foo foo', term_getline(buf, 5))}, 1000)
call WaitForAssert({-> assert_match(':', term_getline(buf, 6))}, 1000)
call term_sendkeys(buf, ":vi\<CR>")
call WaitForAssert({-> assert_match('foo bar', term_getline(buf, 1))}, 1000)

2
src/version.c
View File

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