patch 8.2.3583: the "gd" and "gD" commands do not update search stats
Problem: The "gd" and "gD" commands do not update search stats. (Gary
Johnson)
Solution: Clear search stats.
diff --git a/src/normal.c b/src/normal.c
index ba3b53b..11b61f9 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2305,12 +2305,20 @@
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
|| find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)
- == FAIL)
+ == FAIL)
+ {
clearopbeep(oap);
+ }
+ else
+ {
#ifdef FEAT_FOLDING
- else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
- foldOpenCursor();
+ if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
+ foldOpenCursor();
#endif
+ // clear any search statistics
+ if (messaging() && !msg_silent && !shortmess(SHM_SEARCHCOUNT))
+ clear_cmdline = TRUE;
+ }
}
/*
diff --git a/src/testdir/dumps/Test_searchstatgd_1.dump b/src/testdir/dumps/Test_searchstatgd_1.dump
new file mode 100644
index 0000000..672af91
--- /dev/null
+++ b/src/testdir/dumps/Test_searchstatgd_1.dump
@@ -0,0 +1,10 @@
+|i+0&#ffffff0|n|t| |c|a|t|;| @66
+|i|n|t| >d+0&#ffff4012|o|g|;+0&#ffffff0| @66
+|c|a|t| |=| |d+0&#ffff4012|o|g|;+0&#ffffff0| @64
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|/+0#0000000&|d|o|g| @35|[|1|/|2|]| @11|2|,|5| @10|A|l@1|
diff --git a/src/testdir/dumps/Test_searchstatgd_2.dump b/src/testdir/dumps/Test_searchstatgd_2.dump
new file mode 100644
index 0000000..ea1ac4d
--- /dev/null
+++ b/src/testdir/dumps/Test_searchstatgd_2.dump
@@ -0,0 +1,10 @@
+|i+0&#ffffff0|n|t| >c+0&#ffff4012|a|t|;+0&#ffffff0| @66
+|i|n|t| |d|o|g|;| @66
+|c+0&#ffff4012|a|t| +0&#ffffff0|=| |d|o|g|;| @64
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|5| @10|A|l@1|
diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim
index 2afccef..68fcc49 100644
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -355,4 +355,29 @@
call delete('Xsearchstat')
endfunc
+func Test_search_stat_then_gd()
+ CheckScreendump
+
+ let lines =<< trim END
+ call setline(1, ['int cat;', 'int dog;', 'cat = dog;'])
+ set shortmess-=S
+ set hlsearch
+ END
+ call writefile(lines, 'Xsearchstatgd')
+
+ let buf = RunVimInTerminal('-S Xsearchstatgd', #{rows: 10})
+ call term_sendkeys(buf, "/dog\<CR>")
+ call TermWait(buf)
+ call VerifyScreenDump(buf, 'Test_searchstatgd_1', {})
+
+ call term_sendkeys(buf, "G0gD")
+ call TermWait(buf)
+ call VerifyScreenDump(buf, 'Test_searchstatgd_2', {})
+
+ call StopVimInTerminal(buf)
+ call delete('Xsearchstatgd')
+endfunc
+
+
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 73ba32e..713b5e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3583,
+/**/
3582,
/**/
3581,