patch 7.4.1949
Problem: Minor problems with the quickfix code.
Solution: Fix the problems. (Yegappan Lakshmanan)
diff --git a/src/quickfix.c b/src/quickfix.c
index b72f7d1..e424593 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -623,8 +623,8 @@
if (buflnum > lnumlast)
break;
p_buf = ml_get_buf(buf, buflnum++, FALSE);
- linelen = (int)STRLEN(p_buf);
- if (linelen > IOSIZE - 2)
+ len = (int)STRLEN(p_buf);
+ if (len > IOSIZE - 2)
{
linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len,
&linelen);
@@ -632,7 +632,10 @@
goto qf_init_end;
}
else
+ {
linebuf = IObuff;
+ linelen = len;
+ }
vim_strncpy(linebuf, p_buf, linelen);
}
}
@@ -1435,8 +1438,8 @@
}
/*
- * push dirbuf onto the directory stack and return pointer to actual dir or
- * NULL on error
+ * Push dirbuf onto the directory stack and return pointer to actual dir or
+ * NULL on error.
*/
static char_u *
qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr)
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 380d64b..56bf9cb 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -653,6 +653,8 @@
" 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'
diff --git a/src/version.c b/src/version.c
index 72f4c01..a99c93f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1949,
+/**/
1948,
/**/
1947,