summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-26 19:56:00 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-26 19:56:00 +0200
commit7df0f6313a46b80d760c9a80241922544333351c (patch)
tree07f14160c1faafc0fbab98c8c29f7e291cc6f633
parente4a3bcf28d92d0bde9ca227ccb40d401038185e5 (diff)
downloadvim-git-7df0f6313a46b80d760c9a80241922544333351c.tar.gz
patch 7.4.2261v7.4.2261
Problem: Build fails with small features. Solution: Move "else" inside the #ifdef.
-rw-r--r--src/ex_getln.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 925e2f490..f6e5097f6 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1570,8 +1570,9 @@ getcmdline(
vim_beep(BO_ERROR);
goto cmdline_not_changed;
}
+ else
#endif
- else if (xpc.xp_numfiles > 0)
+ if (xpc.xp_numfiles > 0)
{
if (nextwild(&xpc, (c == Ctrl_P) ? WILD_PREV : WILD_NEXT,
0, firstc != '@') == FAIL)
diff --git a/src/version.c b/src/version.c
index f29263b47..9684a3ee1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2261,
+/**/
2260,
/**/
2259,