summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-01 21:43:42 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-01 21:43:42 +0200
commit26f0cb145ac05651c1507b66937a3888facb3855 (patch)
tree7dd13e05793e717a8119a37327f82df8e8058565
parent0fef0aeb1ca6c85df0a656a70b6ca49c34563c89 (diff)
downloadvim-git-26f0cb145ac05651c1507b66937a3888facb3855.tar.gz
patch 8.1.1243: compiler warnings for incomplete switch statementv8.1.1243
Problem: Compiler warnings for incomplete switch statement. (Tony Mechelynck) Solution: Add ADDR_QUICKFIX to the list.
-rw-r--r--src/ex_docmd.c28
-rw-r--r--src/version.c2
2 files changed, 16 insertions, 14 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 67d06fc8e..b317f53bf 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2228,13 +2228,13 @@ do_one_cmd(
else
ea.line2 = ARGCOUNT;
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
ea.line2 = qf_get_size(&ea);
if (ea.line2 == 0)
ea.line2 = 1;
- break;
#endif
+ break;
case ADDR_NONE:
iemsg(_("INTERNAL: Cannot use DFLALL with ADDR_NONE"));
break;
@@ -2906,11 +2906,11 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent)
case ADDR_TABS_RELATIVE:
eap->line2 = 1;
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
eap->line2 = qf_get_cur_valid_idx(eap);
- break;
#endif
+ break;
case ADDR_NONE:
// Will give an error later if a range is found.
break;
@@ -2979,14 +2979,14 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent)
eap->line2 = ARGCOUNT;
}
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
eap->line1 = 1;
eap->line2 = qf_get_size(eap);
if (eap->line2 == 0)
eap->line2 = 1;
- break;
#endif
+ break;
case ADDR_NONE:
// Will give an error later if a range is found.
break;
@@ -4271,11 +4271,11 @@ get_address(
cmd = NULL;
goto error;
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
lnum = qf_get_cur_valid_idx(eap);
- break;
#endif
+ break;
}
break;
@@ -4315,13 +4315,13 @@ get_address(
cmd = NULL;
goto error;
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
lnum = qf_get_size(eap);
if (lnum == 0)
lnum = 1;
- break;
#endif
+ break;
}
break;
@@ -4500,11 +4500,11 @@ get_address(
case ADDR_TABS_RELATIVE:
lnum = 1;
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
lnum = qf_get_cur_valid_idx(eap);
- break;
#endif
+ break;
case ADDR_NONE:
break;
}
@@ -4661,12 +4661,12 @@ invalid_range(exarg_T *eap)
case ADDR_OTHER:
// Any range is OK.
break;
-#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX:
+#ifdef FEAT_QUICKFIX
if (eap->line2 != 1 && eap->line2 > qf_get_size(eap))
return _(e_invrange);
- break;
#endif
+ break;
case ADDR_NONE:
// Will give an error elsewhere.
break;
diff --git a/src/version.c b/src/version.c
index b8067367a..7de32aeda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1243,
+/**/
1242,
/**/
1241,