Mercurial > vim

changeset 9976:e448370630b2 v7.4.2261

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/7df0f6313a46b80d760c9a80241922544333351c Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Fri, 26 Aug 2016 20:00:13 +0200
parents 03fa8a51e9dc
children 5b1f5a97901a
files src/ex_getln.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,