From 827f2f9f6b75ba182d27c30a6a056968bed65eaa Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Tue, 17 Jan 2017 16:33:53 +0800
Subject: vim-patch:7.4.2050

Problem:    When using ":vimgrep" may end up with duplicate buffers.
Solution:   When adding an error list entry pass the buffer number if possible.

https://github.com/vim/vim/commit/015102e91e978a0bb42a14461c132a85e8f7e1ea
---
 src/nvim/quickfix.c                | 21 +++++++++++++++------
 src/nvim/testdir/test_quickfix.vim | 15 +++++++++++++++
 src/nvim/version.c                 |  2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 2fa0fb9840..3b5fa67f63 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -1282,7 +1282,7 @@ void copy_loclist(win_T *from, win_T *to)
   to->w_llist->qf_curlist = qi->qf_curlist;     /* current list */
 }
 
-// Get buffer number for file "dir.name".
+// Get buffer number for file "directory.fname".
 // Also sets the b_has_qf_entry flag.
 static int qf_get_fnum(qf_info_T *qi, char_u *directory, char_u *fname)
 {
@@ -2123,7 +2123,7 @@ static void qf_msg(qf_info_T *qi, int which, char *lead)
     }
     STRCAT(buf, title);
   }
-  trunc_string(buf, buf, Columns - 1, IOSIZE);
+  trunc_string(buf, buf, (int)Columns - 1, IOSIZE);
   msg(buf);
 }
 
@@ -3484,10 +3484,13 @@ void ex_vimgrep(exarg_T *eap)
         col = 0;
         while (vim_regexec_multi(&regmatch, curwin, buf, lnum,
                                  col, NULL) > 0) {
+          // Pass the buffer number so that it gets used even for a
+          // dummy buffer, unless duplicate_name is set, then the
+          // buffer will be wiped out below.
           if (qf_add_entry(qi,
                            NULL,            // dir
                            fname,
-                           0,
+                           duplicate_name ? 0 : buf->b_fnum,
                            ml_get_buf(buf,
                                       regmatch.startpos[0].lnum + lnum, false),
                            regmatch.startpos[0].lnum + lnum,
@@ -3541,17 +3544,23 @@ void ex_vimgrep(exarg_T *eap)
             buf = NULL;
           } else if (buf != first_match_buf || (flags & VGR_NOJUMP)) {
             unload_dummy_buffer(buf, dirname_start);
+            // Keeping the buffer, remove the dummy flag.
+            buf->b_flags &= ~BF_DUMMY;
             buf = NULL;
           }
         }
 
         if (buf != NULL) {
-          /* If the buffer is still loaded we need to use the
-           * directory we jumped to below. */
+          // Keeping the buffer, remove the dummy flag.
+          buf->b_flags &= ~BF_DUMMY;
+
+          // If the buffer is still loaded we need to use the
+          // directory we jumped to below.
           if (buf == first_match_buf
               && target_dir == NULL
-              && STRCMP(dirname_start, dirname_now) != 0)
+              && STRCMP(dirname_start, dirname_now) != 0) {
             target_dir = vim_strsave(dirname_now);
+          }
 
           /* The buffer is still loaded, the Filetype autocommands
            * need to be done now, in that buffer.  And the modelines
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
index 17f0bde6d3..008cc6c11b 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -1444,3 +1444,18 @@ func Test_history()
   call HistoryTest('c')
   call HistoryTest('l')
 endfunc
+
+func Test_duplicate_buf()
+  " make sure we can get the highest buffer number
+  edit DoesNotExist
+  edit DoesNotExist2
+  let last_buffer = bufnr("$")
+
+  " make sure only one buffer is created
+  call writefile(['this one', 'that one'], 'Xgrepthis')
+  vimgrep one Xgrepthis
+  vimgrep one Xgrepthis
+  call assert_equal(last_buffer + 1, bufnr("$"))
+
+  call delete('Xgrepthis')
+endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 98cfdd1b4a..6e94846907 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -390,7 +390,7 @@ static int included_patches[] = {
   // 2053 NA
   // 2052 NA
   // 2051,
-  // 2050,
+  2050,
   2049,
   // 2048 NA
   // 2047,
-- 
cgit