From: Bram Moolenaar Date: Fri, 26 Aug 2016 17:56:00 +0000 (+0200) Subject: patch 7.4.2261 X-Git-Tag: v7.4.2261 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7df0f6313a46b80d760c9a80241922544333351c;p=vim 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 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 @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2261, /**/ 2260, /**/