16 files changed, 193 insertions, 326 deletions

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index ef9e11fbef..c54e338fca 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -87,7 +87,6 @@ set(CONV_SOURCES
   misc1.c
   ops.c
   path.c
-  quickfix.c
   regexp.c
   screen.c
   search.c
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 62ab7495da..8f5ae3445e 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3014,7 +3014,7 @@ int build_stl_str_hl(
           && item[groupitem[groupdepth]].minwid == 0) {
         bool has_normal_items = false;
         for (long n = groupitem[groupdepth] + 1; n < curitem; n++) {
-          if (item[n].type == Normal) {
+          if (item[n].type == Normal || item[n].type == Highlight) {
             has_normal_items = true;
             break;
           }
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 0be8b3c514..1149ca1e62 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -819,8 +819,8 @@ static void diff_file(char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff)
                  (diff_flags & DIFF_IWHITE) ? "-b " : "",
                  (diff_flags & DIFF_ICASE) ? "-i " : "",
                  tmp_orig, tmp_new);
-    append_redir(cmd, (int)len, p_srr, tmp_diff);
-    block_autocmds(); /* Avoid ShellCmdPost stuff */
+    append_redir(cmd, len, p_srr, tmp_diff);
+    block_autocmds();  // Avoid ShellCmdPost stuff
     (void)call_shell(
         cmd,
         kShellOptFilter | kShellOptSilent | kShellOptDoOut,
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index beae55b8a8..3729cd5f2d 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -165,10 +165,6 @@ static int compl_restarting = FALSE;            /* don't insert match */
  * FALSE the word to be completed must be located. */
 static int compl_started = FALSE;
 
-/* Set when doing something for completion that may call edit() recursively,
- * which is not allowed. */
-static int compl_busy = FALSE;
-
 static int compl_matches = 0;
 static char_u     *compl_pattern = NULL;
 static int compl_direction = FORWARD;
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 96a7c8c5af..decb5e95bc 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1377,9 +1377,9 @@ char_u *make_filter_cmd(char_u *cmd, char_u *itmp, char_u *otmp)
     }
   }
 #endif
-  if (otmp != NULL)
-    append_redir(buf, (int)len, p_srr, otmp);
-
+  if (otmp != NULL) {
+    append_redir(buf, len, p_srr, otmp);
+  }
   return buf;
 }
 
@@ -1390,7 +1390,7 @@ char_u *make_filter_cmd(char_u *cmd, char_u *itmp, char_u *otmp)
  * The caller should make sure that there is enough room:
  *	STRLEN(opt) + STRLEN(fname) + 3
  */
-void append_redir(char_u *buf, int buflen, char_u *opt, char_u *fname)
+void append_redir(char_u *buf, size_t buflen, char_u *opt, char_u *fname)
 {
   char_u      *p;
   char_u      *end;
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index bf67047ae8..a1e54e74a6 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -378,7 +378,7 @@ char_u *get_exception_string(void *value, int type, char_u *cmdname, int *should
   char_u      *p, *val;
 
   if (type == ET_ERROR) {
-    *should_free = FALSE;
+    *should_free = true;
     mesg = ((struct msglist *)value)->throw_msg;
     if (cmdname != NULL && *cmdname != NUL) {
       size_t cmdlen = STRLEN(cmdname);
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 39bff9b2ad..cffda1ca55 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -1130,7 +1130,7 @@ static int command_line_handle_key(CommandLineState *s)
     if (!mouse_has(MOUSE_COMMAND)) {
       return command_line_not_changed(s);                   // Ignore mouse
     }
-    cmdline_paste(0, true, true);
+    cmdline_paste(eval_has_provider("clipboard") ? '*' : 0, true, true);
     redrawcmd();
     return command_line_changed(s);
 
@@ -2424,20 +2424,17 @@ void restore_cmdline_alloc(char_u *p)
   xfree(p);
 }
 
-/*
- * paste a yank register into the command line.
- * used by CTRL-R command in command-line mode
- * insert_reg() can't be used here, because special characters from the
- * register contents will be interpreted as commands.
- *
- * return FAIL for failure, OK otherwise
- */
-static int 
-cmdline_paste (
-    int regname,
-    int literally,          /* Insert text literally instead of "as typed" */
-    int remcr              /* remove trailing CR */
-)
+/// Paste a yank register into the command line.
+/// Used by CTRL-R command in command-line mode.
+/// insert_reg() can't be used here, because special characters from the
+/// register contents will be interpreted as commands.
+///
+/// @param regname   Register name.
+/// @param literally Insert text literally instead of "as typed".
+/// @param remcr     When true, remove trailing CR.
+///
+/// @returns FAIL for failure, OK otherwise
+static bool cmdline_paste(int regname, bool literally, bool remcr)
 {
   long i;
   char_u              *arg;
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 6c135ef47b..70ab4ced75 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -762,6 +762,10 @@ void clearFolding(win_T *win)
  */
 void foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
 {
+  if (compl_busy) {
+    return;
+  }
+
   fold_T      *fp;
   if (wp->w_buffer->terminal) {
     return;
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 69e65c3208..618245ea23 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -214,6 +214,10 @@ EXTERN int compl_length INIT(= 0);
  * stop looking for matches. */
 EXTERN int compl_interrupted INIT(= FALSE);
 
+// Set when doing something for completion that may call edit() recursively,
+// which is not allowed. Also used to disable folding during completion
+EXTERN int compl_busy INIT(= false);
+
 /* List of flags for method of completion. */
 EXTERN int compl_cont_status INIT(= 0);
 # define CONT_ADDING    1       /* "normal" or "adding" expansion */
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 8c7805ba04..5f48fdbf3d 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -1261,21 +1261,18 @@ get_spec_reg (
   return FALSE;
 }
 
-/*
- * Paste a yank register into the command line.
- * Only for non-special registers.
- * Used by CTRL-R command in command-line mode
- * insert_reg() can't be used here, because special characters from the
- * register contents will be interpreted as commands.
- *
- * return FAIL for failure, OK otherwise
- */
-int 
-cmdline_paste_reg (
-    int regname,
-    int literally,          /* Insert text literally instead of "as typed" */
-    int remcr              /* don't add trailing CR */
-)
+/// Paste a yank register into the command line.
+/// Only for non-special registers.
+/// Used by CTRL-R command in command-line mode
+/// insert_reg() can't be used here, because special characters from the
+/// register contents will be interpreted as commands.
+///
+/// @param regname   Register name.
+/// @param literally Insert text literally instead of "as typed".
+/// @param remcr     When true, don't add CR characters.
+///
+/// @returns FAIL for failure, OK otherwise
+bool cmdline_paste_reg(int regname, bool literally, bool remcr)
 {
   long i;
 
@@ -1286,13 +1283,9 @@ cmdline_paste_reg (
   for (i = 0; i < reg->y_size; i++) {
     cmdline_paste_str(reg->y_array[i], literally);
 
-    /* Insert ^M between lines and after last line if type is MLINE.
-     * Don't do this when "remcr" is TRUE and the next line is empty. */
-    if (reg->y_type == MLINE
-        || (i < reg->y_size - 1
-            && !(remcr
-                 && i == reg->y_size - 2
-                 && *reg->y_array[i + 1] == NUL))) {
+    // Insert ^M between lines and after last line if type is MLINE.
+    // Don't do this when "remcr" is true.
+    if ((reg->y_type == MLINE || i < reg->y_size - 1) && !remcr) {
       cmdline_paste_str((char_u *)"\r", literally);
     }
 
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 4a8391430b..171b7a825b 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -200,9 +200,8 @@ qf_init_ext (
   char_u          *pattern;
   char_u          *fmtstr = NULL;
   int col = 0;
-  char_u use_viscol = FALSE;
-  int type = 0;
-  int valid;
+  bool use_viscol = false;
+  char_u type = 0;
   linenr_T buflnum = lnumfirst;
   long lnum = 0L;
   int enr = 0;
@@ -220,16 +219,16 @@ qf_init_ext (
   int i;
   int round;
   int idx = 0;
-  int multiline = FALSE;
-  int multiignore = FALSE;
-  int multiscan = FALSE;
-  int retval = -1;                      /* default: return error flag */
-  char_u          *directory = NULL;
-  char_u          *currfile = NULL;
-  char_u          *tail = NULL;
-  char_u          *p_str = NULL;
-  listitem_T      *p_li = NULL;
-  struct dir_stack_T  *file_stack = NULL;
+  bool multiline = false;
+  bool multiignore = false;
+  bool multiscan = false;
+  int retval = -1;                      // default: return error flag
+  char_u *directory = NULL;
+  char_u *currfile = NULL;
+  char_u *tail = NULL;
+  char_u *p_str = NULL;
+  listitem_T *p_li = NULL;
+  struct dir_stack_T *file_stack = NULL;
   regmatch_T regmatch;
   static struct fmtpattern {
     char_u convchar;
@@ -278,15 +277,16 @@ qf_init_ext (
   /*
    * Get some space to modify the format string into.
    */
-  i = 3 * FMT_PATTERNS + 4 * (int)STRLEN(efm);
-  for (round = FMT_PATTERNS; round > 0; )
-    i += (int)STRLEN(fmt_pat[--round].pattern);
+  size_t fmtstr_size = 3 * FMT_PATTERNS + 4 * STRLEN(efm);
+  for (round = FMT_PATTERNS; round > 0; ) {
+    fmtstr_size += STRLEN(fmt_pat[--round].pattern);
+  }
 #ifdef COLON_IN_FILENAME
-  i += 12;   /* "%f" can become twelve chars longer */
+  fmtstr_size += 12;  // "%f" can become twelve chars longer
 #else
-  i += 2;   /* "%f" can become two chars longer */
+  fmtstr_size += 2;   // "%f" can become two chars longer
 #endif
-  fmtstr = xmalloc(i);
+  fmtstr = xmalloc(fmtstr_size);
 
   while (efm[0] != NUL) {
     /*
@@ -530,11 +530,9 @@ qf_init_ext (
       fmt_start = NULL;
     }
 
-    /*
-     * Try to match each part of 'errorformat' until we find a complete
-     * match or no match.
-     */
-    valid = TRUE;
+    // Try to match each part of 'errorformat' until we find a complete
+    // match or no match.
+    bool valid = true;
 restofline:
     for (; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next) {
       idx = fmt_ptr->prefix;
@@ -546,7 +544,7 @@ restofline:
         errmsg[0] = NUL;
       lnum = 0;
       col = 0;
-      use_viscol = FALSE;
+      use_viscol = false;
       enr = -1;
       type = 0;
       tail = NULL;
@@ -555,25 +553,23 @@ restofline:
       int r = vim_regexec(&regmatch, IObuff, (colnr_T)0);
       fmt_ptr->prog = regmatch.regprog;
       if (r) {
-        if ((idx == 'C' || idx == 'Z') && !multiline)
+        if ((idx == 'C' || idx == 'Z') && !multiline) {
           continue;
-        if (vim_strchr((char_u *)"EWI", idx) != NULL)
-          type = idx;
-        else
+        }
+        if (vim_strchr((char_u *)"EWI", idx) != NULL) {
+          type = (char_u)idx;
+        } else {
           type = 0;
-        /*
-         * Extract error message data from matched line.
-         * We check for an actual submatch, because "\[" and "\]" in
-         * the 'errorformat' may cause the wrong submatch to be used.
-         */
-        if ((i = (int)fmt_ptr->addr[0]) > 0) {                  /* %f */
-          int c;
-
-          if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+        }
+        // Extract error message data from matched line.
+        // We check for an actual submatch, because "\[" and "\]" in
+        // the 'errorformat' may cause the wrong submatch to be used.
+        if ((i = (int)fmt_ptr->addr[0]) > 0) {  // %f
+          if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL) {
             continue;
-
-          /* Expand ~/file and $HOME/file to full path. */
-          c = *regmatch.endp[i];
+          }
+          // Expand ~/file and $HOME/file to full path.
+          char_u c = *regmatch.endp[i];
           *regmatch.endp[i] = NUL;
           expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
           *regmatch.endp[i] = c;
@@ -629,14 +625,14 @@ restofline:
               col -= col % 8;
             }
           }
-          ++col;
-          use_viscol = TRUE;
+          col++;
+          use_viscol = true;
         }
         if ((i = (int)fmt_ptr->addr[8]) > 0) {                  /* %v */
           if (regmatch.startp[i] == NULL)
             continue;
           col = (int)atol((char *)regmatch.startp[i]);
-          use_viscol = TRUE;
+          use_viscol = true;
         }
         if ((i = (int)fmt_ptr->addr[9]) > 0) {                  /* %s */
           if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
@@ -653,7 +649,7 @@ restofline:
         break;
       }
     }
-    multiscan = FALSE;
+    multiscan = false;
 
     if (fmt_ptr == NULL || idx == 'D' || idx == 'X') {
       if (fmt_ptr != NULL) {
@@ -667,20 +663,21 @@ restofline:
         } else if (idx == 'X')                          /* leave directory */
           directory = qf_pop_dir(&dir_stack);
       }
-      namebuf[0] = NUL;                 /* no match found, remove file name */
-      lnum = 0;                         /* don't jump to this line */
-      valid = FALSE;
-      STRCPY(errmsg, IObuff);           /* copy whole line to error message */
-      if (fmt_ptr == NULL)
-        multiline = multiignore = FALSE;
+      namebuf[0] = NUL;                 // no match found, remove file name
+      lnum = 0;                         // don't jump to this line
+      valid = false;
+      STRCPY(errmsg, IObuff);           // copy whole line to error message
+      if (fmt_ptr == NULL) {
+        multiline = multiignore = false;
+      }
     } else if (fmt_ptr != NULL) {
       /* honor %> item */
       if (fmt_ptr->conthere)
         fmt_start = fmt_ptr;
 
       if (vim_strchr((char_u *)"AEWI", idx) != NULL) {
-        multiline = TRUE;    /* start of a multi-line message */
-        multiignore = FALSE; /* reset continuation */
+        multiline = true;     // start of a multi-line message
+        multiignore = false;  // reset continuation
       } else if (vim_strchr((char_u *)"CZ", idx)
                  != NULL) { /* continuation of multi-line msg */
         if (qfprev == NULL)
@@ -702,15 +699,17 @@ restofline:
         qfprev->qf_viscol = use_viscol;
         if (!qfprev->qf_fnum)
           qfprev->qf_fnum = qf_get_fnum(directory,
-              *namebuf || directory ? namebuf
-              : currfile && valid ? currfile : 0);
-        if (idx == 'Z')
-          multiline = multiignore = FALSE;
+                                        *namebuf
+                                        || directory ? namebuf : currfile
+                                        && valid ? currfile : 0);
+        if (idx == 'Z') {
+          multiline = multiignore = false;
+        }
         line_breakcheck();
         continue;
       } else if (vim_strchr((char_u *)"OPQ", idx) != NULL) {
-        /* global file names */
-        valid = FALSE;
+        // global file names
+        valid = false;
         if (*namebuf == NUL || os_file_exists(namebuf)) {
           if (*namebuf && idx == 'P')
             currfile = qf_push_dir(namebuf, &file_stack);
@@ -719,14 +718,15 @@ restofline:
           *namebuf = NUL;
           if (tail && *tail) {
             STRMOVE(IObuff, skipwhite(tail));
-            multiscan = TRUE;
+            multiscan = true;
             goto restofline;
           }
         }
       }
-      if (fmt_ptr->flags == '-') {      /* generally exclude this line */
-        if (multiline)
-          multiignore = TRUE;           /* also exclude continuation lines */
+      if (fmt_ptr->flags == '-') {  // generally exclude this line
+        if (multiline) {
+          multiignore = true;       // also exclude continuation lines
+        }
         continue;
       }
     }
@@ -867,26 +867,27 @@ void qf_free_all(win_T *wp)
       qf_free(qi, i);
 }
 
-/*
- * Add an entry to the end of the list of errors.
- * Returns OK or FAIL.
- */
-static int 
-qf_add_entry (
-    qf_info_T *qi,                /* quickfix list */
-    qfline_T **prevp,            /* nonnull pointer (to previously added entry or NULL) */
-    char_u *dir,               /* optional directory name */
-    char_u *fname,             /* file name or NULL */
-    int bufnum,                     /* buffer number or zero */
-    char_u *mesg,              /* message */
-    long lnum,                      /* line number */
-    int col,                        /* column */
-    int vis_col,                    /* using visual column */
-    char_u *pattern,           /* search pattern */
-    int nr,                         /* error number */
-    int type,                       /* type character */
-    int valid                      /* valid entry */
-)
+/// Add an entry to the end of the list of errors.
+///
+/// @param  qi       quickfix list
+/// @param  prevp    nonnull pointer (to previously added entry or NULL)
+/// @param  dir      optional directory name
+/// @param  fname    file name or NULL
+/// @param  bufnum   buffer number or zero
+/// @param  mesg     message
+/// @param  lnum     line number
+/// @param  col      column
+/// @param  vis_col  using visual column
+/// @param  pattern  search pattern
+/// @param  nr       error number
+/// @param  type     type character
+/// @param  valid    valid entry
+///
+/// @returns OK or FAIL.
+static int qf_add_entry(qf_info_T *qi, qfline_T **prevp, char_u *dir,
+                        char_u *fname, int bufnum, char_u *mesg, long lnum,
+                        int col, char_u vis_col, char_u *pattern, int nr,
+                        char_u type, char_u valid)
 {
   qfline_T *qfp = xmalloc(sizeof(qfline_T));
 
@@ -1657,12 +1658,13 @@ win_found:
        * flag is present in 'shortmess'; But when not jumping, print the
        * whole message. */
       i = msg_scroll;
-      if (curbuf == old_curbuf && curwin->w_cursor.lnum == old_lnum)
-        msg_scroll = TRUE;
-      else if (!msg_scrolled && shortmess(SHM_OVERALL))
-        msg_scroll = FALSE;
-      msg_attr_keep(IObuff, 0, TRUE);
-      msg_scroll = i;
+      if (curbuf == old_curbuf && curwin->w_cursor.lnum == old_lnum) {
+        msg_scroll = true;
+      } else if (!msg_scrolled && shortmess(SHM_OVERALL)) {
+        msg_scroll = false;
+      }
+      msg_attr_keep(IObuff, 0, true);
+      msg_scroll = (int)i;
     }
   } else {
     if (opened_window)
@@ -1827,10 +1829,12 @@ void qf_age(exarg_T *eap)
     }
   }
 
-  if (eap->addr_count != 0)
-    count = eap->line2;
-  else
+  if (eap->addr_count != 0) {
+    assert(eap->line2 <= INT_MAX);
+    count = (int)eap->line2;
+  } else {
     count = 1;
+  }
   while (count--) {
     if (eap->cmdidx == CMD_colder || eap->cmdidx == CMD_lolder) {
       if (qi->qf_curlist == 0) {
@@ -1948,7 +1952,7 @@ static char_u *qf_types(int c, int nr)
     p = (char_u *)"";
   else {
     cc[0] = ' ';
-    cc[1] = c;
+    cc[1] = (char_u)c;
     cc[2] = NUL;
     p = cc;
   }
@@ -2036,12 +2040,13 @@ void ex_copen(exarg_T *eap)
     }
   }
 
-  if (eap->addr_count != 0)
-    height = eap->line2;
-  else
+  if (eap->addr_count != 0) {
+    assert(eap->line2 <= INT_MAX);
+    height = (int)eap->line2;
+  } else {
     height = QF_WINHEIGHT;
-
-  reset_VIsual_and_resel();                     /* stop Visual mode */
+  }
+  reset_VIsual_and_resel();  // stop Visual mode
 
   /*
    * Find existing quickfix window, or open a new one.
@@ -2434,7 +2439,7 @@ void ex_make(exarg_T *eap)
 {
   char_u      *fname;
   char_u      *cmd;
-  unsigned len;
+  size_t len;
   win_T       *wp = NULL;
   qf_info_T   *qi = &ql_info;
   int res;
@@ -2475,9 +2480,10 @@ void ex_make(exarg_T *eap)
   /*
    * If 'shellpipe' empty: don't redirect to 'errorfile'.
    */
-  len = (unsigned)STRLEN(p_shq) * 2 + (unsigned)STRLEN(eap->arg) + 1;
-  if (*p_sp != NUL)
-    len += (unsigned)STRLEN(p_sp) + (unsigned)STRLEN(fname) + 3;
+  len = STRLEN(p_shq) * 2 + STRLEN(eap->arg) + 1;
+  if (*p_sp != NUL) {
+    len += STRLEN(p_sp) + STRLEN(fname) + 3;
+  }
   cmd = xmalloc(len);
   sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
       (char *)p_shq);
@@ -2548,11 +2554,11 @@ static char_u *get_mef_name(void)
 
   /* Keep trying until the name doesn't exist yet. */
   for (;; ) {
-    if (start == -1)
-      start = os_get_pid();
-    else
+    if (start == -1) {
+      start = (int)os_get_pid();
+    } else {
       off += 19;
-
+    }
     name = xmalloc(STRLEN(p_mef) + 30);
     STRCPY(name, p_mef);
     sprintf((char *)name + (p - p_mef), "%d%d", start, off);
@@ -2899,7 +2905,7 @@ void ex_vimgrep(exarg_T *eap)
   int found_match;
   buf_T       *first_match_buf = NULL;
   time_t seconds = 0;
-  int save_mls;
+  long save_mls;
   char_u      *save_ei = NULL;
   aco_save_T aco;
   int flags = 0;
@@ -3456,18 +3462,12 @@ int get_errorlist(win_T *wp, list_T *list)
  */
 int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
 {
-  listitem_T  *li;
-  dict_T      *d;
-  char_u      *filename, *pattern, *text, *type;
-  int bufnum;
-  long lnum;
-  int col, nr;
-  int vcol;
-  qfline_T    *prevp = NULL;
-  int valid, status;
+  listitem_T *li;
+  dict_T *d;
+  qfline_T *prevp = NULL;
   int retval = OK;
-  qf_info_T   *qi = &ql_info;
-  int did_bufnr_emsg = FALSE;
+  qf_info_T *qi = &ql_info;
+  bool did_bufnr_emsg = false;
 
   if (wp != NULL) {
     qi = ll_get_or_alloc_list(wp);
@@ -3494,21 +3494,22 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
     if (d == NULL)
       continue;
 
-    filename = get_dict_string(d, (char_u *)"filename", TRUE);
-    bufnum = get_dict_number(d, (char_u *)"bufnr");
-    lnum = get_dict_number(d, (char_u *)"lnum");
-    col = get_dict_number(d, (char_u *)"col");
-    vcol = get_dict_number(d, (char_u *)"vcol");
-    nr = get_dict_number(d, (char_u *)"nr");
-    type = get_dict_string(d, (char_u *)"type", TRUE);
-    pattern = get_dict_string(d, (char_u *)"pattern", TRUE);
-    text = get_dict_string(d, (char_u *)"text", TRUE);
-    if (text == NULL)
+    char_u *filename = get_dict_string(d, (char_u *)"filename", true);
+    int bufnum = (int)get_dict_number(d, (char_u *)"bufnr");
+    long lnum = get_dict_number(d, (char_u *)"lnum");
+    int col = (int)get_dict_number(d, (char_u *)"col");
+    char_u vcol = (char_u)get_dict_number(d, (char_u *)"vcol");
+    int nr = (int)get_dict_number(d, (char_u *)"nr");
+    char_u *type = get_dict_string(d, (char_u *)"type", true);
+    char_u *pattern = get_dict_string(d, (char_u *)"pattern", true);
+    char_u *text = get_dict_string(d, (char_u *)"text", true);
+    if (text == NULL) {
       text = vim_strsave((char_u *)"");
-
-    valid = TRUE;
-    if ((filename == NULL && bufnum == 0) || (lnum == 0 && pattern == NULL))
-      valid = FALSE;
+    }
+    bool valid = true;
+    if ((filename == NULL && bufnum == 0) || (lnum == 0 && pattern == NULL)) {
+      valid = false;
+    }
 
     /* Mark entries with non-existing buffer number as not valid. Give the
      * error message only once. */
@@ -3517,22 +3518,23 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
         did_bufnr_emsg = TRUE;
         EMSGN(_("E92: Buffer %" PRId64 " not found"), bufnum);
       }
-      valid = FALSE;
+      valid = false;
       bufnum = 0;
     }
 
-    status =  qf_add_entry(qi, &prevp,
-        NULL,                               /* dir */
-        filename,
-        bufnum,
-        text,
-        lnum,
-        col,
-        vcol,                               /* vis_col */
-        pattern,                            /* search pattern */
-        nr,
-        type == NULL ? NUL : *type,
-        valid);
+    int status = qf_add_entry(qi,
+                              &prevp,
+                              NULL,      // dir
+                              filename,
+                              bufnum,
+                              text,
+                              lnum,
+                              col,
+                              vcol,      // vis_col
+                              pattern,   // search pattern
+                              nr,
+                              (char_u)(type == NULL ? NUL : *type),
+                              valid);
 
     xfree(filename);
     xfree(pattern);
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 04e28cf5ca..26f0a6c94b 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -6395,7 +6395,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)
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 63ca4cf6c4..ec236e72b4 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -32,7 +32,6 @@ SCRIPTS := \
            test69.out             \
            test73.out             \
            test79.out             \
-           test88.out             \
            test_listlbr.out       \
            test_breakindent.out   \
            test_close_count.out   \
diff --git a/src/nvim/testdir/test88.in b/src/nvim/testdir/test88.in
deleted file mode 100644
index 9e43f703e9..0000000000
--- a/src/nvim/testdir/test88.in
+++ /dev/null
@@ -1,99 +0,0 @@
-vim: set ft=vim
-
-Tests for correct display (cursor column position) with +conceal and
-tabulators.
-
-STARTTEST
-:so small.vim
-:if !has('conceal')
-   e! test.ok
-   wq! test.out
-:endif
-:" Conceal settings.
-:set conceallevel=2
-:set concealcursor=nc
-:syntax match test /|/ conceal
-:" Save current cursor position. Only works in <expr> mode, can't be used
-:" with :normal because it moves the cursor to the command line. Thanks to ZyX
-:" <zyx.vim@gmail.com> for the idea to use an <expr> mapping.
-:let positions = []
-:nnoremap <expr> GG ":let positions += ['".screenrow().":".screencol()."']\n"
-:" Start test.
-/^start:
-:normal ztj
-GGk
-:" We should end up in the same column when running these commands on the two
-:" lines.
-:normal ft
-GGk
-:normal $
-GGk
-:normal 0j
-GGk
-:normal ft
-GGk
-:normal $
-GGk
-:normal 0j0j
-GGk
-:" Same for next test block.
-:normal ft
-GGk
-:normal $
-GGk
-:normal 0j
-GGk
-:normal ft
-GGk
-:normal $
-GGk
-:normal 0j0j
-GGk
-:" And check W with multiple tabs and conceals in a line.
-:normal W
-GGk
-:normal W
-GGk
-:normal W
-GGk
-:normal $
-GGk
-:normal 0j
-GGk
-:normal W
-GGk
-:normal W
-GGk
-:normal W
-GGk
-:normal $
-GGk
-:set lbr
-:normal $
-GGk
-:set list listchars=tab:>-
-:normal 0
-GGk
-:normal W
-GGk
-:normal W
-GGk
-:normal W
-GGk
-:normal $
-GGk
-:" Display result.
-:call append('$', 'end:')
-:call append('$', positions)
-:/^end/,$wq! test.out
-ENDTEST
-
-start:
-.concealed.     text
-|concealed|	text
-
-	.concealed.	text
-	|concealed|	text
-
-.a.	.b.	.c.	.d.
-|a|	|b|	|c|	|d|
diff --git a/src/nvim/testdir/test88.ok b/src/nvim/testdir/test88.ok
deleted file mode 100644
index 12949f274a..0000000000
--- a/src/nvim/testdir/test88.ok
+++ /dev/null
@@ -1,29 +0,0 @@
-end:
-2:1
-2:17
-2:20
-3:1
-3:17
-3:20
-5:8
-5:25
-5:28
-6:8
-6:25
-6:28
-8:1
-8:9
-8:17
-8:25
-8:27
-9:1
-9:9
-9:17
-9:25
-9:26
-9:26
-9:1
-9:9
-9:17
-9:25
-9:26
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4e875516c0..b934ac6d47 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,6 +69,7 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  1511,
   1366,
 
   // 1219 NA
@@ -317,7 +318,7 @@ static int included_patches[] = {
   // 976 NA
   975,
   974,
-  // 973,
+  973,
   972,
   // 971 NA
   // 970 NA