vim-patch:7.4.1949

Problem:    Minor problems with the quickfix code.
Solution:   Fix the problems. (Yegappan Lakshmanan)

38df43bd13

src/nvim/quickfix.c

@@ -541,11 +541,12 @@ qf_init_ext (
         if (buflnum > lnumlast)
           break;
         p_buf = ml_get_buf(buf, buflnum++, false);
-        linelen = STRLEN(p_buf);
+        len = STRLEN(p_buf);
-        if (linelen > IOSIZE - 2) {
+        if (len > IOSIZE - 2) {
             linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len, &linelen);
         } else {
           linebuf = IObuff;
+          linelen = len;
         }
         STRLCPY(linebuf, p_buf, linelen + 1);
       }
@@ -1238,10 +1239,8 @@ static int qf_get_fnum(char_u *directory, char_u *fname)
   return buf->b_fnum;
 }
 
-/*
+// Push dirbuf onto the directory stack and return pointer to actual dir or
- * push dirbuf onto the directory stack and return pointer to actual dir or
+// NULL on error.
- * NULL on error
- */
 static char_u *qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr)
 {
   struct dir_stack_T  *ds_ptr;

src/nvim/testdir/test_quickfix.vim

@@ -635,6 +635,8 @@ endfunction
 
 " Test for quickfix directory stack support
 function! s:dir_stack_tests(cchar)
+  call s:setup_commands(a:cchar)
+
   let save_efm=&efm
   set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f'
 

src/nvim/version.c

@@ -491,7 +491,7 @@ static int included_patches[] = {
   1952,
   // 1951 NA
   // 1950,
-  // 1949,
+  1949,
   // 1948,
   // 1947 NA
   // 1946 NA