summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-05-05 17:14:14 +0200
committerBram Moolenaar <Bram@vim.org>2011-05-05 17:14:14 +0200
commitd236ac0d49aca2f0fa5cb5232baae7a0b1b90d59 (patch)
treeff0d7e13031a5065325b40f782f6992388be8e55
parent1c32dff7d6b4cf00d1e63ac79968e9deb8b90e2e (diff)
updated for version 7.3.173v7.3.173
Problem: After using setqflist() to make the quickfix list empty ":cwindow" may open the window anyway. Also after ":vimgrep". Solution: Correctly check whether the list is empty. (Ingo Karkat)
-rw-r--r--src/quickfix.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/quickfix.c b/src/quickfix.c
index a285f284fc..1876093f89 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1164,7 +1164,7 @@ copy_loclist(from, to)
/* When no valid entries are present in the list, qf_ptr points to
* the first item in the list */
- if (to_qfl->qf_nonevalid == TRUE)
+ if (to_qfl->qf_nonevalid)
to_qfl->qf_ptr = to_qfl->qf_start;
}
@@ -2243,6 +2243,7 @@ ex_cwindow(eap)
* it if we have errors; otherwise, leave it closed.
*/
if (qi->qf_lists[qi->qf_curlist].qf_nonevalid
+ || qi->qf_lists[qi->qf_curlist].qf_count == 0
|| qi->qf_curlist >= qi->qf_listcount)
{
if (win != NULL)
@@ -3711,7 +3712,7 @@ set_errorlist(wp, list, action, title)
}
if (qi->qf_lists[qi->qf_curlist].qf_index == 0)
- /* empty list or no valid entry */
+ /* no valid entry */
qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE;
else
qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
diff --git a/src/version.c b/src/version.c
index d4edf67ce3..c44d2f16b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 173,
+/**/
172,
/**/
171,