# HG changeset patch # User Christian Brabandt # Date 1472234413 -7200 # Node ID e448370630b22f060fc30504b5951f8a75e2e78c # Parent 03fa8a51e9dc9cd18965be58542107cc054ce7da commit https://github.com/vim/vim/commit/7df0f6313a46b80d760c9a80241922544333351c Author: Bram Moolenaar Date: Fri Aug 26 19:56:00 2016 +0200 patch 7.4.2261 Problem: Build fails with small features. Solution: Move "else" inside the #ifdef. diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1570,8 +1570,9 @@ getcmdline( vim_beep(BO_ERROR); goto cmdline_not_changed; } -#endif - else if (xpc.xp_numfiles > 0) + else +#endif + 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 --- 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,