1 files changed, 20 insertions, 18 deletions

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 478fa973a1..41af7af55c 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -4478,12 +4478,10 @@ syn_cmd_region (
   if (illegal || not_enough)
     rest = NULL;
 
-  /*
-   * Must have a "start" and "end" pattern.
-   */
-  if (rest != NULL && (pat_ptrs[ITEM_START] == NULL ||
-                       pat_ptrs[ITEM_END] == NULL)) {
-    not_enough = TRUE;
+  // Must have a "start" and "end" pattern.
+  if (rest != NULL && (pat_ptrs[ITEM_START] == NULL
+                       || pat_ptrs[ITEM_END] == NULL)) {
+    not_enough = true;
     rest = NULL;
   }
 
@@ -5533,25 +5531,29 @@ char_u *get_syntax_name(expand_T *xp, int idx)
 }
 
 
-/*
- * Function called for expression evaluation: get syntax ID at file position.
- */
-int 
-syn_get_id (
+// Function called for expression evaluation: get syntax ID at file position.
+int syn_get_id(
     win_T *wp,
     long lnum,
     colnr_T col,
-    int trans,                  /* remove transparency */
-    bool *spellp,               /* return: can do spell checking */
-    int keep_state              /* keep state of char at "col" */
+    int trans,      // remove transparency
+    bool *spellp,   // return: can do spell checking
+    int keep_state  // keep state of char at "col"
 )
 {
-  /* When the position is not after the current position and in the same
-   * line of the same buffer, need to restart parsing. */
+  // When the position is not after the current position and in the same
+  // line of the same buffer, need to restart parsing.
   if (wp->w_buffer != syn_buf
       || lnum != current_lnum
-      || col < current_col)
+      || 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);
 
@@ -6391,7 +6393,7 @@ do_highlight (
             HL_TABLE()[idx].sg_cterm_bg = color + 1;
             if (is_normal_group) {
               cterm_normal_bg_color = color + 1;
-              {
+              if (!ui_rgb_attached()) {
                 must_redraw = CLEAR;
                 if (color >= 0) {
                   if (t_colors < 16)