patch 7.4.1141

Problem:    Using searchpair() with a skip expression that uses syntax
            highlighting sometimes doesn't work. (David Fishburn)
Solution:   Reset next_match_idx. (Christian Brabandt)

diff --git a/src/syntax.c b/src/syntax.c
index badb2264281bfd6890e5c1205ebdb5c9a427ad6c..6e1a5e24a11c18f0671f450e4ed1e3abf1f79659 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6474,6 +6474,12 @@ syn_get_id(wp, lnum, col, trans, spellp, keep_state)
            || lnum != current_lnum
            || col < current_col)
        syntax_start(wp, lnum);
+    else if (wp->w_buffer == syn_buf
+           && lnum == current_lnum
+           && col > current_col)
+       /* next_match may not be correct when moving around, e.g. with the
+        * "skip" expression in searchpair() */
+       next_match_idx = -1;
 
     (void)get_syntax_attr(col, spellp, keep_state);
 

diff --git a/src/version.c b/src/version.c
index c1b8f5d930e1f27683daac8875d9cb4157c6e7ef..3ea9a1557b50b1b2c495b61905455357dfaef629 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1141,
 /**/
     1140,
 /**/