1 files changed, 20 insertions, 11 deletions

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index e897be5f6b..fc2e1a4295 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -811,7 +811,7 @@ retry:
         }
         break;
       }
-      if (STRLEN(IObuff) < IOSIZE - 1 || IObuff[IOSIZE - 1] == '\n') {
+      if (STRLEN(IObuff) < IOSIZE - 1 || IObuff[IOSIZE - 2] == '\n') {
         break;
       }
     }
@@ -904,6 +904,7 @@ static bool qf_list_has_valid_entries(qf_list_T *qfl)
 
 /// Return a pointer to a list in the specified quickfix stack
 static qf_list_T * qf_get_list(qf_info_T *qi, int idx)
+  FUNC_ATTR_NONNULL_ALL
 {
   return &qi->qf_lists[idx];
 }
@@ -1233,6 +1234,7 @@ static char_u * qf_cmdtitle(char_u *cmd)
 
 /// Return a pointer to the current list in the specified quickfix stack
 static qf_list_T * qf_get_curlist(qf_info_T *qi)
+  FUNC_ATTR_NONNULL_ALL
 {
   return qf_get_list(qi, qi->qf_curlist);
 }
@@ -3840,7 +3842,7 @@ static void qf_update_buffer(qf_info_T *qi, qfline_T *old_last)
 
 // Add an error line to the quickfix buffer.
 static int qf_buf_add_line(buf_T *buf, linenr_T lnum, const qfline_T *qfp,
-                           char_u *dirname)
+                           char_u *dirname, bool first_bufline)
   FUNC_ATTR_NONNULL_ALL
 {
   int len;
@@ -3855,9 +3857,12 @@ static int qf_buf_add_line(buf_T *buf, linenr_T lnum, const qfline_T *qfp,
     if (qfp->qf_type == 1) {  // :helpgrep
       STRLCPY(IObuff, path_tail(errbuf->b_fname), IOSIZE - 1);
     } else {
-      // shorten the file name if not done already
-      if (errbuf->b_sfname == NULL
-          || path_is_absolute(errbuf->b_sfname)) {
+      // Shorten the file name if not done already.
+      // For optimization, do this only for the first entry in a
+      // buffer.
+      if (first_bufline
+          && (errbuf->b_sfname == NULL
+              || path_is_absolute(errbuf->b_sfname))) {
         if (*dirname == NUL) {
           os_dirname(dirname, MAXPATHL);
         }
@@ -3935,6 +3940,7 @@ static void qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last)
   // Check if there is anything to display
   if (qfl != NULL) {
      char_u dirname[MAXPATHL];
+     int prev_bufnr = -1;
 
      *dirname = NUL;
 
@@ -3947,9 +3953,11 @@ static void qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last)
       lnum = buf->b_ml.ml_line_count;
     }
     while (lnum < qfl->qf_count) {
-      if (qf_buf_add_line(buf, lnum, qfp, dirname) == FAIL) {
+      if (qf_buf_add_line(buf, lnum, qfp, dirname,
+                          prev_bufnr != qfp->qf_fnum) == FAIL) {
         break;
       }
+      prev_bufnr = qfp->qf_fnum;
       lnum++;
       qfp = qfp->qf_next;
       if (qfp == NULL) {
@@ -4915,12 +4923,13 @@ static bool vgr_qflist_valid(win_T *wp, qf_info_T *qi, unsigned qfid,
 /// Search for a pattern in all the lines in a buffer and add the matching lines
 /// to a quickfix list.
 static bool vgr_match_buflines(qf_info_T *qi, char_u *fname, buf_T *buf,
-                               regmmatch_T *regmatch, long tomatch,
+                               regmmatch_T *regmatch, long *tomatch,
                                int duplicate_name, int flags)
+  FUNC_ATTR_NONNULL_ARG(1, 3, 4, 5)
 {
   bool found_match = false;
 
-  for (long lnum = 1; lnum <= buf->b_ml.ml_line_count && tomatch > 0; lnum++) {
+  for (long lnum = 1; lnum <= buf->b_ml.ml_line_count && *tomatch > 0; lnum++) {
     colnr_T col = 0;
     while (vim_regexec_multi(regmatch, curwin, buf, lnum, col, NULL,
                              NULL) > 0) {
@@ -4946,7 +4955,7 @@ static bool vgr_match_buflines(qf_info_T *qi, char_u *fname, buf_T *buf,
         break;
       }
       found_match = true;
-      if (--tomatch == 0) {
+      if (--*tomatch == 0) {
         break;
       }
       if ((flags & VGR_GLOBAL) == 0 || regmatch->endpos[0].lnum > 0) {
@@ -5120,7 +5129,7 @@ void ex_vimgrep(exarg_T *eap)
     } else {
       // Try for a match in all lines of the buffer.
       // For ":1vimgrep" look for first match only.
-      found_match = vgr_match_buflines(qi, fname, buf, &regmatch, tomatch,
+      found_match = vgr_match_buflines(qi, fname, buf, &regmatch, &tomatch,
                                        duplicate_name, flags);
 
       if (using_dummy) {
@@ -6458,7 +6467,7 @@ void ex_cexpr(exarg_T *eap)
   // Evaluate the expression.  When the result is a string or a list we can
   // use it to fill the errorlist.
   typval_T tv;
-  if (eval0(eap->arg, &tv, NULL, true) != FAIL) {
+  if (eval0(eap->arg, &tv, &eap->nextcmd, true) != FAIL) {
     if ((tv.v_type == VAR_STRING && tv.vval.v_string != NULL)
         || tv.v_type == VAR_LIST) {
       incr_quickfix_busy();