patch 7.4.2261

brammool · brammool · commit 7df0f6313a46 · 2016-08-26T19:56:00.000+02:00
Problem:    Build fails with small features.
Solution:   Move "else" inside the #ifdef.
diff --git 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
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2261,
 /**/
     2260,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -1570,8 +1570,9 @@ getcmdline(`
`1570`	`1570`	`vim_beep(BO_ERROR);`
`1571`	`1571`	`goto cmdline_not_changed;`
`1572`	`1572`	`}`
	`1573`	`+ else`
`1573`	`1574`	`#endif`
`1574`		`- else if (xpc.xp_numfiles > 0)`
	`1575`	`+ if (xpc.xp_numfiles > 0)`
`1575`	`1576`	`{`
`1576`	`1577`	`if (nextwild(&xpc, (c == Ctrl_P) ? WILD_PREV : WILD_NEXT,`
`1577`	`1578`	`0, firstc != '@') == FAIL)`