diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-10-08 21:04:19 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-10-08 21:04:19 +0200 |
| commit | c9aa6e4f2a040dc7f8411139d39d0463487100da (patch) | |
| tree | 3f04b565d711c6ea333cf48b9f1281cb08ca1d87 | |
| parent | cb1d1dcc879cadfe81ca0088b7e7ebbcd92a9ff3 (diff) | |
patch 9.1.0767: A condition is always true in ex_getln.cv9.1.0767
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>
| -rw-r--r-- | src/ex_getln.c | 10 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index da2a8c7b77..980faf8566 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -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; diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 122793c4da..c3525315fe 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -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 diff --git a/src/version.c b/src/version.c index f09a60f3af..854865f6b0 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 767, +/**/ 766, /**/ 765, |