1 files changed, 35 insertions, 19 deletions

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index b4ebf2ece5..2709ba83f3 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -678,8 +678,6 @@ static void win_update(win_T *wp)
       mod_bot = wp->w_redraw_bot + 1;
     else
       mod_bot = 0;
-    wp->w_redraw_top = 0;       /* reset for next time */
-    wp->w_redraw_bot = 0;
     if (buf->b_mod_set) {
       if (mod_top == 0 || mod_top > buf->b_mod_top) {
         mod_top = buf->b_mod_top;
@@ -776,6 +774,8 @@ static void win_update(win_T *wp)
     if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu)
       mod_bot = MAXLNUM;
   }
+  wp->w_redraw_top = 0;  // reset for next time
+  wp->w_redraw_bot = 0;
 
   /*
    * When only displaying the lines at the top, set top_end.  Used when
@@ -1135,6 +1135,9 @@ static void win_update(win_T *wp)
   /* reset got_int, otherwise regexp won't work */
   save_got_int = got_int;
   got_int = 0;
+  // Set the time limit to 'redrawtime'.
+  proftime_T syntax_tm = profile_setlimit(p_rdt);
+  syn_set_timeout(&syntax_tm);
   win_foldinfo.fi_level = 0;
 
   /*
@@ -1493,6 +1496,7 @@ static void win_update(win_T *wp)
   if (wp->w_redr_type >= REDRAW_TOP) {
     draw_vsep_win(wp, 0);
   }
+  syn_set_timeout(NULL);
 
   /* Reset the type of redrawing required, the window has been updated. */
   wp->w_redr_type = 0;
@@ -2189,7 +2193,7 @@ win_line (
     // To speed up the loop below, set extra_check when there is linebreak,
     // trailing white space and/or syntax processing to be done.
     extra_check = wp->w_p_lbr;
-    if (syntax_present(wp) && !wp->w_s->b_syn_error) {
+    if (syntax_present(wp) && !wp->w_s->b_syn_error && !wp->w_s->b_syn_slow) {
       // Prepare for syntax highlighting in this line.  When there is an
       // error, stop syntax highlighting.
       save_did_emsg = did_emsg;
@@ -2199,8 +2203,10 @@ win_line (
         wp->w_s->b_syn_error = true;
       } else {
         did_emsg = save_did_emsg;
-        has_syntax = true;
-        extra_check = true;
+        if (!wp->w_s->b_syn_slow) {
+          has_syntax = true;
+          extra_check = true;
+        }
       }
     }
 
@@ -2440,7 +2446,9 @@ win_line (
   }
 
   if (wp->w_p_list) {
-    if (curwin->w_p_lcs_chars.space || wp->w_p_lcs_chars.trail) {
+    if (curwin->w_p_lcs_chars.space
+        || wp->w_p_lcs_chars.trail
+        || wp->w_p_lcs_chars.nbsp) {
       extra_check = true;
     }
     // find start of trailing whitespace
@@ -2539,9 +2547,10 @@ win_line (
       }
       wp->w_cursor = pos;
 
-      /* Need to restart syntax highlighting for this line. */
-      if (has_syntax)
+      // Need to restart syntax highlighting for this line.
+      if (has_syntax) {
         syntax_start(wp, lnum);
+      }
     }
   }
 
@@ -2587,6 +2596,9 @@ win_line (
     }
     next_search_hl(wp, shl, lnum, (colnr_T)v,
                    shl == &search_hl ? NULL : cur);
+    if (wp->w_s->b_syn_slow) {
+      has_syntax = false;
+    }
 
     // Need to get the line again, a multi-line regexp may have made it
     // invalid.
@@ -3265,16 +3277,18 @@ win_line (
           line = ml_get_buf(wp->w_buffer, lnum, FALSE);
           ptr = line + v;
 
-          if (!attr_pri)
+          if (!attr_pri) {
             char_attr = syntax_attr;
-          else
+          } else {
             char_attr = hl_combine_attr(syntax_attr, char_attr);
-          /* no concealing past the end of the line, it interferes
-           * with line highlighting */
-          if (c == NUL)
+          }
+          // no concealing past the end of the line, it interferes
+          // with line highlighting.
+          if (c == NUL) {
             syntax_flags = 0;
-          else
+          } else {
             syntax_flags = get_syntax_info(&syntax_seqnr);
+          }
         } else if (!attr_pri) {
           char_attr = 0;
         }
@@ -3366,7 +3380,7 @@ win_line (
         }
 
         if (wp->w_buffer->terminal) {
-          char_attr = hl_combine_attr(char_attr, term_attrs[vcol]);
+          char_attr = hl_combine_attr(term_attrs[vcol], char_attr);
         }
 
         // Found last space before word: check for line break.
@@ -3981,8 +3995,10 @@ win_line (
       break;
     }
 
-    // line continues beyond line end
-    if (wp->w_p_lcs_chars.ext
+    // Show "extends" character from 'listchars' if beyond the line end and
+    // 'list' is set.
+    if (wp->w_p_lcs_chars.ext != NUL
+        && wp->w_p_list
         && !wp->w_p_wrap
         && filler_todo <= 0
         && (wp->w_p_rl ? col == 0 : col == grid->Columns - 1)
@@ -4821,13 +4837,13 @@ static void win_redr_status(win_T *wp)
     p = NameBuff;
     len = (int)STRLEN(p);
 
-    if (wp->w_buffer->b_help
+    if (bt_help(wp->w_buffer)
         || wp->w_p_pvw
         || bufIsChanged(wp->w_buffer)
         || wp->w_buffer->b_p_ro) {
       *(p + len++) = ' ';
     }
-    if (wp->w_buffer->b_help) {
+    if (bt_help(wp->w_buffer)) {
       STRCPY(p + len, _("[Help]"));
       len += (int)STRLEN(p + len);
     }