Patch 8.0.0733
Problem: Can only add entries to one list in the quickfix stack.
Solution: Move state variables from qf_list_T to qf_list_T. (Yegappan
Lakshmanan)
Files: src/quickfix.c
*** ../vim-8.0.0732/src/quickfix.c 2017-06-28 21:26:24.122302194 +0200
--- src/quickfix.c 2017-07-19 13:18:23.002569425 +0200
***************
*** 67,72 ****
--- 67,80 ----
char_u *qf_title; /* title derived from the command that created
* the error list or set by setqflist */
typval_T *qf_ctx; /* context set by setqflist/setloclist */
+
+ struct dir_stack_T *qf_dir_stack;
+ char_u *qf_directory;
+ struct dir_stack_T *qf_file_stack;
+ char_u *qf_currfile;
+ int qf_multiline;
+ int qf_multiignore;
+ int qf_multiscan;
} qf_list_T;
/*
***************
*** 85,99 ****
int qf_listcount; /* current number of lists */
int qf_curlist; /* current error list */
qf_list_T qf_lists[LISTCOUNT];
-
- int qf_dir_curlist; /* error list for
qf_dir_stack */
- struct dir_stack_T *qf_dir_stack;
- char_u *qf_directory;
- struct dir_stack_T *qf_file_stack;
- char_u *qf_currfile;
- int qf_multiline;
- int qf_multiignore;
- int qf_multiscan;
};
static qf_info_T ql_info; /* global quickfix list */
--- 93,98 ----
***************
*** 130,136 ****
static efm_T *fmt_start = NULL; /* cached across qf_parse_line() calls */
! static int qf_init_ext(qf_info_T *qi, char_u *efile, buf_T *buf, typval_T
*tv, char_u *errorformat, int newlist, linenr_T lnumfirst, linenr_T lnumlast,
char_u *qf_title, char_u *enc);
static void qf_store_title(qf_info_T *qi, int qf_idx, char_u *title);
static void qf_new_list(qf_info_T *qi, char_u *qf_title);
static void ll_free_all(qf_info_T **pqi);
--- 129,135 ----
static efm_T *fmt_start = NULL; /* cached across qf_parse_line() calls */
! static int qf_init_ext(qf_info_T *qi, int qf_idx, char_u *efile, buf_T
*buf, typval_T *tv, char_u *errorformat, int newlist, linenr_T lnumfirst,
linenr_T lnumlast, char_u *qf_title, char_u *enc);
static void qf_store_title(qf_info_T *qi, int qf_idx, char_u *title);
static void qf_new_list(qf_info_T *qi, char_u *qf_title);
static void ll_free_all(qf_info_T **pqi);
***************
*** 138,147 ****
static qf_info_T *ll_new_list(void);
static void qf_free(qf_info_T *qi, int idx);
static char_u *qf_types(int, int);
! static int qf_get_fnum(qf_info_T *qi, char_u *, char_u *);
static char_u *qf_push_dir(char_u *, struct dir_stack_T **, int
is_file_stack);
static char_u *qf_pop_dir(struct dir_stack_T **);
! static char_u *qf_guess_filepath(qf_info_T *qi, char_u *);
static void qf_fmt_text(char_u *text, char_u *buf, int bufsize);
static void qf_clean_dir_stack(struct dir_stack_T **);
#ifdef FEAT_WINDOWS
--- 137,146 ----
static qf_info_T *ll_new_list(void);
static void qf_free(qf_info_T *qi, int idx);
static char_u *qf_types(int, int);
! static int qf_get_fnum(qf_info_T *qi, int qf_idx, char_u *, char_u *);
static char_u *qf_push_dir(char_u *, struct dir_stack_T **, int
is_file_stack);
static char_u *qf_pop_dir(struct dir_stack_T **);
! static char_u *qf_guess_filepath(qf_info_T *qi, int qf_idx, char_u *);
static void qf_fmt_text(char_u *text, char_u *buf, int bufsize);
static void qf_clean_dir_stack(struct dir_stack_T **);
#ifdef FEAT_WINDOWS
***************
*** 200,208 ****
return FAIL;
}
! return qf_init_ext(qi, efile, curbuf, NULL, errorformat, newlist,
! (linenr_T)0, (linenr_T)0,
! qf_title, enc);
}
/*
--- 199,206 ----
return FAIL;
}
! return qf_init_ext(qi, qi->qf_curlist, efile, curbuf, NULL, errorformat,
! newlist, (linenr_T)0, (linenr_T)0, qf_title, enc);
}
/*
***************
*** 831,836 ****
--- 829,835 ----
static int
qf_parse_line(
qf_info_T *qi,
+ int qf_idx,
char_u *linebuf,
int linelen,
efm_T *fmt_first,
***************
*** 843,848 ****
--- 842,848 ----
int idx = 0;
char_u *tail = NULL;
regmatch_T regmatch;
+ qf_list_T *qfl = &qi->qf_lists[qf_idx];
/* Always ignore case when looking for a matching error. */
regmatch.rm_ic = TRUE;
***************
*** 867,877 ****
int r;
idx = fmt_ptr->prefix;
! if (qi->qf_multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL)
continue;
fields->namebuf[0] = NUL;
fields->pattern[0] = NUL;
! if (!qi->qf_multiscan)
fields->errmsg[0] = NUL;
fields->lnum = 0;
fields->col = 0;
--- 867,877 ----
int r;
idx = fmt_ptr->prefix;
! if (qfl->qf_multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL)
continue;
fields->namebuf[0] = NUL;
fields->pattern[0] = NUL;
! if (!qfl->qf_multiscan)
fields->errmsg[0] = NUL;
fields->lnum = 0;
fields->col = 0;
***************
*** 885,891 ****
fmt_ptr->prog = regmatch.regprog;
if (r)
{
! if ((idx == 'C' || idx == 'Z') && !qi->qf_multiline)
continue;
if (vim_strchr((char_u *)"EWI", idx) != NULL)
fields->type = idx;
--- 885,891 ----
fmt_ptr->prog = regmatch.regprog;
if (r)
{
! if ((idx == 'C' || idx == 'Z') && !qfl->qf_multiline)
continue;
if (vim_strchr((char_u *)"EWI", idx) != NULL)
fields->type = idx;
***************
*** 937,943 ****
continue;
fields->type = *regmatch.startp[i];
}
! if (fmt_ptr->flags == '+' && !qi->qf_multiscan) /* %+ */
{
if (linelen >= fields->errmsglen)
{
--- 937,943 ----
continue;
fields->type = *regmatch.startp[i];
}
! if (fmt_ptr->flags == '+' && !qfl->qf_multiscan) /* %+ */
{
if (linelen >= fields->errmsglen)
{
***************
*** 1013,1019 ****
break;
}
}
! qi->qf_multiscan = FALSE;
if (fmt_ptr == NULL || idx == 'D' || idx == 'X')
{
--- 1013,1019 ----
break;
}
}
! qfl->qf_multiscan = FALSE;
if (fmt_ptr == NULL || idx == 'D' || idx == 'X')
{
***************
*** 1026,1038 ****
EMSG(_("E379: Missing or empty directory name"));
return QF_FAIL;
}
! qi->qf_directory =
! qf_push_dir(fields->namebuf, &qi->qf_dir_stack, FALSE);
! if (qi->qf_directory == NULL)
return QF_FAIL;
}
else if (idx == 'X') /* leave directory */
! qi->qf_directory = qf_pop_dir(&qi->qf_dir_stack);
}
fields->namebuf[0] = NUL; /* no match found, remove file name */
fields->lnum = 0; /* don't jump to this line */
--- 1026,1038 ----
EMSG(_("E379: Missing or empty directory name"));
return QF_FAIL;
}
! qfl->qf_directory =
! qf_push_dir(fields->namebuf, &qfl->qf_dir_stack, FALSE);
! if (qfl->qf_directory == NULL)
return QF_FAIL;
}
else if (idx == 'X') /* leave directory */
! qfl->qf_directory = qf_pop_dir(&qfl->qf_dir_stack);
}
fields->namebuf[0] = NUL; /* no match found, remove file name */
fields->lnum = 0; /* don't jump to this line */
***************
*** 1048,1054 ****
/* copy whole line to error message */
vim_strncpy(fields->errmsg, linebuf, linelen);
if (fmt_ptr == NULL)
! qi->qf_multiline = qi->qf_multiignore = FALSE;
}
else if (fmt_ptr != NULL)
{
--- 1048,1054 ----
/* copy whole line to error message */
vim_strncpy(fields->errmsg, linebuf, linelen);
if (fmt_ptr == NULL)
! qfl->qf_multiline = qfl->qf_multiignore = FALSE;
}
else if (fmt_ptr != NULL)
{
***************
*** 1058,1075 ****
if (vim_strchr((char_u *)"AEWI", idx) != NULL)
{
! qi->qf_multiline = TRUE; /* start of a multi-line message */
! qi->qf_multiignore = FALSE; /* reset continuation */
}
else if (vim_strchr((char_u *)"CZ", idx) != NULL)
{ /* continuation of multi-line msg */
! if (!qi->qf_multiignore)
{
! qfline_T *qfprev = qi->qf_lists[qi->qf_curlist].qf_last;
if (qfprev == NULL)
return QF_FAIL;
! if (*fields->errmsg && !qi->qf_multiignore)
{
len = (int)STRLEN(qfprev->qf_text);
if ((ptr = alloc((unsigned)(len + STRLEN(fields->errmsg) +
2)))
--- 1058,1075 ----
if (vim_strchr((char_u *)"AEWI", idx) != NULL)
{
! qfl->qf_multiline = TRUE; /* start of a multi-line message */
! qfl->qf_multiignore = FALSE;/* reset continuation */
}
else if (vim_strchr((char_u *)"CZ", idx) != NULL)
{ /* continuation of multi-line msg */
! if (!qfl->qf_multiignore)
{
! qfline_T *qfprev = qfl->qf_last;
if (qfprev == NULL)
return QF_FAIL;
! if (*fields->errmsg && !qfl->qf_multiignore)
{
len = (int)STRLEN(qfprev->qf_text);
if ((ptr = alloc((unsigned)(len + STRLEN(fields->errmsg) +
2)))
***************
*** 1093,1106 ****
qfprev->qf_col = fields->col;
qfprev->qf_viscol = fields->use_viscol;
if (!qfprev->qf_fnum)
! qfprev->qf_fnum = qf_get_fnum(qi, qi->qf_directory,
! *fields->namebuf || qi->qf_directory != NULL
? fields->namebuf
! : qi->qf_currfile != NULL && fields->valid
! ? qi->qf_currfile : 0);
}
if (idx == 'Z')
! qi->qf_multiline = qi->qf_multiignore = FALSE;
line_breakcheck();
return QF_IGNORE_LINE;
}
--- 1093,1107 ----
qfprev->qf_col = fields->col;
qfprev->qf_viscol = fields->use_viscol;
if (!qfprev->qf_fnum)
! qfprev->qf_fnum = qf_get_fnum(qi, qf_idx,
! qfl->qf_directory,
! *fields->namebuf || qfl->qf_directory != NULL
? fields->namebuf
! : qfl->qf_currfile != NULL && fields->valid
! ? qfl->qf_currfile : 0);
}
if (idx == 'Z')
! qfl->qf_multiline = qfl->qf_multiignore = FALSE;
line_breakcheck();
return QF_IGNORE_LINE;
}
***************
*** 1111,1134 ****
if (*fields->namebuf == NUL || mch_getperm(fields->namebuf) >= 0)
{
if (*fields->namebuf && idx == 'P')
! qi->qf_currfile =
! qf_push_dir(fields->namebuf, &qi->qf_file_stack, TRUE);
else if (idx == 'Q')
! qi->qf_currfile = qf_pop_dir(&qi->qf_file_stack);
*fields->namebuf = NUL;
if (tail && *tail)
{
STRMOVE(IObuff, skipwhite(tail));
! qi->qf_multiscan = TRUE;
goto restofline;
}
}
}
if (fmt_ptr->flags == '-') /* generally exclude this line */
{
! if (qi->qf_multiline)
/* also exclude continuation lines */
! qi->qf_multiignore = TRUE;
return QF_IGNORE_LINE;
}
}
--- 1112,1135 ----
if (*fields->namebuf == NUL || mch_getperm(fields->namebuf) >= 0)
{
if (*fields->namebuf && idx == 'P')
! qfl->qf_currfile =
! qf_push_dir(fields->namebuf, &qfl->qf_file_stack, TRUE);
else if (idx == 'Q')
! qfl->qf_currfile = qf_pop_dir(&qfl->qf_file_stack);
*fields->namebuf = NUL;
if (tail && *tail)
{
STRMOVE(IObuff, skipwhite(tail));
! qfl->qf_multiscan = TRUE;
goto restofline;
}
}
}
if (fmt_ptr->flags == '-') /* generally exclude this line */
{
! if (qfl->qf_multiline)
/* also exclude continuation lines */
! qfl->qf_multiignore = TRUE;
return QF_IGNORE_LINE;
}
}
***************
*** 1149,1154 ****
--- 1150,1156 ----
static int
qf_init_ext(
qf_info_T *qi,
+ int qf_idx,
char_u *efile,
buf_T *buf,
typval_T *tv,
***************
*** 1159,1164 ****
--- 1161,1167 ----
char_u *qf_title,
char_u *enc)
{
+ qf_list_T *qfl;
qfstate_T state;
qffields_T fields;
#ifdef FEAT_WINDOWS
***************
*** 1196,1214 ****
goto qf_init_end;
}
! if (newlist || qi->qf_curlist == qi->qf_listcount)
/* make place for a new list */
qf_new_list(qi, qf_title);
else
{
/* Adding to existing list, use last entry. */
adding = TRUE;
#ifdef FEAT_WINDOWS
! if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
! old_last = qi->qf_lists[qi->qf_curlist].qf_last;
#endif
}
/* Use the local value of 'errorformat' if it's set. */
if (errorformat == p_efm && tv == NULL && *buf->b_p_efm != NUL)
efm = buf->b_p_efm;
--- 1199,1222 ----
goto qf_init_end;
}
! if (newlist || qf_idx == qi->qf_listcount)
! {
/* make place for a new list */
qf_new_list(qi, qf_title);
+ qf_idx = qi->qf_curlist;
+ }
else
{
/* Adding to existing list, use last entry. */
adding = TRUE;
#ifdef FEAT_WINDOWS
! if (qi->qf_lists[qf_idx].qf_count > 0)
! old_last = qi->qf_lists[qf_idx].qf_last;
#endif
}
+ qfl = &qi->qf_lists[qf_idx];
+
/* Use the local value of 'errorformat' if it's set. */
if (errorformat == p_efm && tv == NULL && *buf->b_p_efm != NUL)
efm = buf->b_p_efm;
***************
*** 1216,1236 ****
efm = errorformat;
/*
- * If we are not adding or adding to another list: clear the state.
- */
- if (newlist || qi->qf_curlist != qi->qf_dir_curlist)
- {
- qi->qf_dir_curlist = qi->qf_curlist;
- qf_clean_dir_stack(&qi->qf_dir_stack);
- qi->qf_directory = NULL;
- qf_clean_dir_stack(&qi->qf_file_stack);
- qi->qf_currfile = NULL;
- qi->qf_multiline = FALSE;
- qi->qf_multiignore = FALSE;
- qi->qf_multiscan = FALSE;
- }
-
- /*
* If the errorformat didn't change between calls, then reuse the
* previously parsed values.
*/
--- 1224,1229 ----
***************
*** 1281,1288 ****
if (status == QF_END_OF_INPUT) /* end of input */
break;
! status = qf_parse_line(qi, state.linebuf, state.linelen, fmt_first,
! &fields);
if (status == QF_FAIL)
goto error2;
if (status == QF_NOMEM)
--- 1274,1281 ----
if (status == QF_END_OF_INPUT) /* end of input */
break;
! status = qf_parse_line(qi, qf_idx, state.linebuf, state.linelen,
! fmt_first, &fields);
if (status == QF_FAIL)
goto error2;
if (status == QF_NOMEM)
***************
*** 1291,1302 ****
continue;
if (qf_add_entry(qi,
! qi->qf_curlist,
! qi->qf_directory,
! (*fields.namebuf || qi->qf_directory != NULL)
? fields.namebuf
! : ((qi->qf_currfile != NULL && fields.valid)
! ? qi->qf_currfile : (char_u *)NULL),
0,
fields.errmsg,
fields.lnum,
--- 1284,1295 ----
continue;
if (qf_add_entry(qi,
! qf_idx,
! qfl->qf_directory,
! (*fields.namebuf || qfl->qf_directory != NULL)
? fields.namebuf
! : ((qfl->qf_currfile != NULL && fields.valid)
! ? qfl->qf_currfile : (char_u *)NULL),
0,
fields.errmsg,
fields.lnum,
***************
*** 1311,1339 ****
}
if (state.fd == NULL || !ferror(state.fd))
{
! if (qi->qf_lists[qi->qf_curlist].qf_index == 0)
{
/* no valid entry found */
! qi->qf_lists[qi->qf_curlist].qf_ptr =
! qi->qf_lists[qi->qf_curlist].qf_start;
! qi->qf_lists[qi->qf_curlist].qf_index = 1;
! qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE;
}
else
{
! qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
! if (qi->qf_lists[qi->qf_curlist].qf_ptr == NULL)
! qi->qf_lists[qi->qf_curlist].qf_ptr =
! qi->qf_lists[qi->qf_curlist].qf_start;
}
/* return number of matches */
! retval = qi->qf_lists[qi->qf_curlist].qf_count;
goto qf_init_end;
}
EMSG(_(e_readerrf));
error2:
if (!adding)
{
qf_free(qi, qi->qf_curlist);
qi->qf_listcount--;
if (qi->qf_curlist > 0)
--- 1304,1331 ----
}
if (state.fd == NULL || !ferror(state.fd))
{
! if (qfl->qf_index == 0)
{
/* no valid entry found */
! qfl->qf_ptr = qfl->qf_start;
! qfl->qf_index = 1;
! qfl->qf_nonevalid = TRUE;
}
else
{
! qfl->qf_nonevalid = FALSE;
! if (qfl->qf_ptr == NULL)
! qfl->qf_ptr = qfl->qf_start;
}
/* return number of matches */
! retval = qfl->qf_count;
goto qf_init_end;
}
EMSG(_(e_readerrf));
error2:
if (!adding)
{
+ /* Error when creating a new list. Free the new list */
qf_free(qi, qi->qf_curlist);
qi->qf_listcount--;
if (qi->qf_curlist > 0)
***************
*** 1348,1354 ****
vim_free(state.growbuf);
#ifdef FEAT_WINDOWS
! qf_update_buffer(qi, old_last);
#endif
#ifdef FEAT_MBYTE
if (state.vc.vc_type != CONV_NONE)
--- 1340,1347 ----
vim_free(state.growbuf);
#ifdef FEAT_WINDOWS
! if (qf_idx == qi->qf_curlist)
! qf_update_buffer(qi, old_last);
#endif
#ifdef FEAT_MBYTE
if (state.vc.vc_type != CONV_NONE)
***************
*** 1484,1490 ****
(qi == &ql_info) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
}
else
! qfp->qf_fnum = qf_get_fnum(qi, dir, fname);
if ((qfp->qf_text = vim_strsave(mesg)) == NULL)
{
vim_free(qfp);
--- 1477,1483 ----
(qi == &ql_info) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
}
else
! qfp->qf_fnum = qf_get_fnum(qi, qf_idx, dir, fname);
if ((qfp->qf_text = vim_strsave(mesg)) == NULL)
{
vim_free(qfp);
***************
*** 1695,1701 ****
* Also sets the b_has_qf_entry flag.
*/
static int
! qf_get_fnum(qf_info_T *qi, char_u *directory, char_u *fname)
{
char_u *ptr = NULL;
buf_T *buf;
--- 1688,1694 ----
* Also sets the b_has_qf_entry flag.
*/
static int
! qf_get_fnum(qf_info_T *qi, int qf_idx, char_u *directory, char_u *fname)
{
char_u *ptr = NULL;
buf_T *buf;
***************
*** 1724,1730 ****
if (mch_getperm(ptr) < 0)
{
vim_free(ptr);
! directory = qf_guess_filepath(qi, fname);
if (directory)
ptr = concat_fnames(directory, fname, TRUE);
else
--- 1717,1723 ----
if (mch_getperm(ptr) < 0)
{
vim_free(ptr);
! directory = qf_guess_filepath(qi, qf_idx, fname);
if (directory)
ptr = concat_fnames(directory, fname, TRUE);
else
***************
*** 1893,1909 ****
* qf_guess_filepath will return NULL.
*/
static char_u *
! qf_guess_filepath(qf_info_T *qi, char_u *filename)
{
struct dir_stack_T *ds_ptr;
struct dir_stack_T *ds_tmp;
char_u *fullname;
/* no dirs on the stack - there's nothing we can do */
! if (qi->qf_dir_stack == NULL)
return NULL;
! ds_ptr = qi->qf_dir_stack->next;
fullname = NULL;
while (ds_ptr)
{
--- 1886,1903 ----
* qf_guess_filepath will return NULL.
*/
static char_u *
! qf_guess_filepath(qf_info_T *qi, int qf_idx, char_u *filename)
{
struct dir_stack_T *ds_ptr;
struct dir_stack_T *ds_tmp;
char_u *fullname;
+ qf_list_T *qfl = &qi->qf_lists[qf_idx];
/* no dirs on the stack - there's nothing we can do */
! if (qfl->qf_dir_stack == NULL)
return NULL;
! ds_ptr = qfl->qf_dir_stack->next;
fullname = NULL;
while (ds_ptr)
{
***************
*** 1922,1931 ****
vim_free(fullname);
/* clean up all dirs we already left */
! while (qi->qf_dir_stack->next != ds_ptr)
{
! ds_tmp = qi->qf_dir_stack->next;
! qi->qf_dir_stack->next = qi->qf_dir_stack->next->next;
vim_free(ds_tmp->dirname);
vim_free(ds_tmp);
}
--- 1916,1925 ----
vim_free(fullname);
/* clean up all dirs we already left */
! while (qfl->qf_dir_stack->next != ds_ptr)
{
! ds_tmp = qfl->qf_dir_stack->next;
! qfl->qf_dir_stack->next = qfl->qf_dir_stack->next->next;
vim_free(ds_tmp->dirname);
vim_free(ds_tmp);
}
***************
*** 2761,2772 ****
qfline_T *qfp;
qfline_T *qfpnext;
int stop = FALSE;
! while (qi->qf_lists[idx].qf_count && qi->qf_lists[idx].qf_start != NULL)
{
! qfp = qi->qf_lists[idx].qf_start;
qfpnext = qfp->qf_next;
! if (qi->qf_lists[idx].qf_title != NULL && !stop)
{
vim_free(qfp->qf_text);
stop = (qfp == qfpnext);
--- 2755,2767 ----
qfline_T *qfp;
qfline_T *qfpnext;
int stop = FALSE;
+ qf_list_T *qfl = &qi->qf_lists[idx];
! while (qfl->qf_count && qfl->qf_start != NULL)
{
! qfp = qfl->qf_start;
qfpnext = qfp->qf_next;
! if (qfl->qf_title != NULL && !stop)
{
vim_free(qfp->qf_text);
stop = (qfp == qfpnext);
***************
*** 2776,2800 ****
/* Somehow qf_count may have an incorrect value, set it to 1
* to avoid crashing when it's wrong.
* TODO: Avoid qf_count being incorrect. */
! qi->qf_lists[idx].qf_count = 1;
}
! qi->qf_lists[idx].qf_start = qfpnext;
! --qi->qf_lists[idx].qf_count;
}
! qi->qf_lists[idx].qf_index = 0;
! qi->qf_lists[idx].qf_start = NULL;
! qi->qf_lists[idx].qf_last = NULL;
! qi->qf_lists[idx].qf_ptr = NULL;
! qi->qf_lists[idx].qf_nonevalid = TRUE;
!
! qf_clean_dir_stack(&qi->qf_dir_stack);
! qi->qf_directory = NULL;
! qf_clean_dir_stack(&qi->qf_file_stack);
! qi->qf_currfile = NULL;
! qi->qf_multiline = FALSE;
! qi->qf_multiignore = FALSE;
! qi->qf_multiscan = FALSE;
}
/*
--- 2771,2795 ----
/* Somehow qf_count may have an incorrect value, set it to 1
* to avoid crashing when it's wrong.
* TODO: Avoid qf_count being incorrect. */
! qfl->qf_count = 1;
}
! qfl->qf_start = qfpnext;
! --qfl->qf_count;
}
! qfl->qf_index = 0;
! qfl->qf_start = NULL;
! qfl->qf_last = NULL;
! qfl->qf_ptr = NULL;
! qfl->qf_nonevalid = TRUE;
!
! qf_clean_dir_stack(&qfl->qf_dir_stack);
! qfl->qf_directory = NULL;
! qf_clean_dir_stack(&qfl->qf_file_stack);
! qfl->qf_currfile = NULL;
! qfl->qf_multiline = FALSE;
! qfl->qf_multiignore = FALSE;
! qfl->qf_multiscan = FALSE;
}
/*
***************
*** 2804,2815 ****
static void
qf_free(qf_info_T *qi, int idx)
{
qf_free_items(qi, idx);
! vim_free(qi->qf_lists[idx].qf_title);
! qi->qf_lists[idx].qf_title = NULL;
! free_tv(qi->qf_lists[idx].qf_ctx);
! qi->qf_lists[idx].qf_ctx = NULL;
}
/*
--- 2799,2812 ----
static void
qf_free(qf_info_T *qi, int idx)
{
+ qf_list_T *qfl = &qi->qf_lists[idx];
+
qf_free_items(qi, idx);
! vim_free(qfl->qf_title);
! qfl->qf_title = NULL;
! free_tv(qfl->qf_ctx);
! qfl->qf_ctx = NULL;
}
/*
***************
*** 5259,5265 ****
qf_title = IObuff;
}
! if (qf_init_ext(qi, NULL, buf, NULL, p_efm,
(eap->cmdidx != CMD_caddbuffer
&& eap->cmdidx != CMD_laddbuffer),
eap->line1, eap->line2,
--- 5256,5262 ----
qf_title = IObuff;
}
! if (qf_init_ext(qi, qi->qf_curlist, NULL, buf, NULL, p_efm,
(eap->cmdidx != CMD_caddbuffer
&& eap->cmdidx != CMD_laddbuffer),
eap->line1, eap->line2,
***************
*** 5328,5334 ****
if ((tv->v_type == VAR_STRING && tv->vval.v_string != NULL)
|| (tv->v_type == VAR_LIST && tv->vval.v_list != NULL))
{
! if (qf_init_ext(qi, NULL, NULL, tv, p_efm,
(eap->cmdidx != CMD_caddexpr
&& eap->cmdidx != CMD_laddexpr),
(linenr_T)0, (linenr_T)0, *eap->cmdlinep,
--- 5325,5331 ----
if ((tv->v_type == VAR_STRING && tv->vval.v_string != NULL)
|| (tv->v_type == VAR_LIST && tv->vval.v_list != NULL))
{
! if (qf_init_ext(qi, qi->qf_curlist, NULL, NULL, tv, p_efm,
(eap->cmdidx != CMD_caddexpr
&& eap->cmdidx != CMD_laddexpr),
(linenr_T)0, (linenr_T)0, *eap->cmdlinep,
*** ../vim-8.0.0732/src/version.c 2017-07-19 12:51:48.018228639 +0200
--- src/version.c 2017-07-19 13:12:30.641161313 +0200
***************
*** 771,772 ****
--- 771,774 ----
{ /* Add new patch number below this line */
+ /**/
+ 733,
/**/
--
hundred-and-one symptoms of being an internet addict:
184. You no longer ask prospective dates what their sign is, instead
your line is "Hi, what's your URL?"
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
