patch 8.2.0637: incsearch highlighting does not work for ":sort!"

Problem:    Incsearch highlighting does not work for ":sort!".
Solution:   Skip over the exclamation point. (closes #5983)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 18da926560de5ae723e8624e32cd9150ef9cdf5c..7e92ec899296049f2b1c4860f45c6e7d06da5eff 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -249,7 +249,9 @@ do_incsearch_highlighting(int firstc, int *search_delim, incsearch_state_T *is_s
     }
     else if (STRNCMP(cmd, "sort", MAX(p - cmd, 3)) == 0)
     {
-       // skip over flags
+       // skip over ! and flags
+       if (*p == '!')
+           p = skipwhite(p + 1);
        while (ASCII_ISALPHA(*(p = skipwhite(p))))
            ++p;
        if (*p == NUL)

diff --git a/src/testdir/dumps/Test_incsearch_sort_02.dump b/src/testdir/dumps/Test_incsearch_sort_02.dump
new file mode 100644 (file)
index 0000000..ee752e1
--- /dev/null
+++ b/src/testdir/dumps/Test_incsearch_sort_02.dump
@@ -0,0 +1,9 @@
+|a+0&#ffffff0|n|o|t|h|e|r| |o+1&&|n|e+0&&| |2| @56
+|t|h|a|t| |o+0&#ffff4012|n|e+0&#ffffff0| |3| @59
+|t|h|e| |o+0&#ffff4012|n|e+0&#ffffff0| |1| @60
+|~+0#4040ff13&| @68
+|~| @68
+|~| @68
+|~| @68
+|~| @68
+|:+0#0000000&|s|o|r|t|!| |/|o|n> @59

diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index aaa42352ced65b09f5ec2a3013be79b8fa8a70aa..7aaf8db52dbad46c20e144223f36d676e3c2268e 100644 (file)
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1136,11 +1136,14 @@ func Test_incsearch_sort_dump()
   " the 'ambiwidth' check.
   sleep 100m
 
-  " Need to send one key at a time to force a redraw.
   call term_sendkeys(buf, ':sort ni u /on')
   call VerifyScreenDump(buf, 'Test_incsearch_sort_01', {})
   call term_sendkeys(buf, "\<Esc>")
 
+  call term_sendkeys(buf, ':sort! /on')
+  call VerifyScreenDump(buf, 'Test_incsearch_sort_02', {})
+  call term_sendkeys(buf, "\<Esc>")
+
   call StopVimInTerminal(buf)
   call delete('Xis_sort_script')
 endfunc

diff --git a/src/version.c b/src/version.c
index 7c753e22ab5c9f2e1ee92cca1684f7c47c0b6a4f..28d317922a7cffb1a765327f56cd2f90a0a52141 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    637,
 /**/
     636,
 /**/