From 6773a348da0dcf45df3c6c6649880655ec0d2042 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 19 Jan 2016 20:52:44 +0100 Subject: [PATCH] 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) --- src/syntax.c | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/syntax.c b/src/syntax.c index badb22642..6e1a5e24a 100644 --- 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 c1b8f5d93..3ea9a1557 100644 --- 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, /**/ -- 2.40.0