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

patch 9.1.0767: A condition is always true in ex_getln.c

Browse Source 
Problem:  A cmdlen == 0 condition is always true as ccline.cmdlen == 0
          was already checked above (after v9.1.0766).
Solution: Remove the condition and the variable.
          (zeertzjq)

closes: #15830

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-10-08 21:04:19 +02:00 committed by Christian Brabandt
parent cb1d1dcc87
commit c9aa6e4f2a
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ex_getln.c
View File

@ -1092,10 +1092,6 @@ cmdline_erase_chars(
else if (ccline.cmdlen == 0 && c != Ctrl_W
&& ccline.cmdprompt == NULL && indent == 0)
{
#ifdef FEAT_SEARCH_EXTRA
int cmdlen;
#endif
// In ex and debug mode it doesn't make sense to return.
if (exmode_active
#ifdef FEAT_EVAL
@ -1104,9 +1100,6 @@ cmdline_erase_chars(
)
return CMDLINE_NOT_CHANGED;
#ifdef FEAT_SEARCH_EXTRA
cmdlen = ccline.cmdlen;
#endif
dealloc_cmdbuff(); // no commandline to return
if (!cmd_silent)
@ -1120,8 +1113,7 @@ cmdline_erase_chars(
msg_putchar(' '); // delete ':'
}
#ifdef FEAT_SEARCH_EXTRA
if (cmdlen == 0)
isp->search_start = isp->save_cursor;
isp->search_start = isp->save_cursor;
#endif
redraw_cmdline = TRUE;
return GOTO_NORMAL_MODE;

2
src/testdir/test_mapping.vim
View File

@ -89,7 +89,7 @@ func Test_abclear_buffer()
\ .. "! foo foobar", execute('abbrev'))
abclear
call assert_equal("\n\nNo abbreviation found", execute('abbrev'))
call assert_equal("\n\nNo abbreviation found", execute('abbrev'))
%bwipe
endfunc

2
src/version.c
View File

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