patch 8.0.1393: too much highlighting with 'hlsearch' and 'incsearch' set
Problem: Too much highlighting with 'hlsearch' and 'incsearch' set.
Solution: Do not highlight matches when the pattern matches everything.
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 4202b03..7c553e4 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -173,6 +173,22 @@
}
/*
+ * Guess that the pattern matches everything. Only finds specific cases, such
+ * as a trailing \|, which can happen while typing a pattern.
+ */
+ static int
+empty_pattern(char_u *p)
+{
+ int n = STRLEN(p);
+
+ /* remove trailing \v and the like */
+ while (n >= 2 && p[n - 2] == '\\'
+ && vim_strchr((char_u *)"mMvVcCZ", p[n - 1]) != NULL)
+ n -= 2;
+ return n == 0 || (n >= 2 && p[n - 2] == '\\' && p[n - 1] == '|');
+}
+
+/*
* getcmdline() - accept a command line starting with firstc.
*
* firstc == ':' get ":" command line.
@@ -2023,6 +2039,11 @@
else
end_pos = curwin->w_cursor; /* shutup gcc 4 */
+ /* Disable 'hlsearch' highlighting if the pattern matches
+ * everything. Avoids a flash when typing "foo\|". */
+ if (empty_pattern(ccline.cmdbuff))
+ SET_NO_HLSEARCH(TRUE);
+
validate_cursor();
/* May redraw the status line to show the cursor position. */
if (p_ru && curwin->w_status_height > 0)
diff --git a/src/version.c b/src/version.c
index ab1f816..4b18f63 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1393,
+/**/
1392,
/**/
1391,