From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 24 Jul 2008 11:51:40 +0000 (+0000)
Subject: updated for version 7.2b-012
X-Git-Tag: v7.2b.012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=688e5f7ee7e9384494e9c16ae48c512980c54e4f;p=vim

updated for version 7.2b-012
---

diff --git a/src/main.c b/src/main.c
index 587081bda..7718e97c8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2245,7 +2245,12 @@ scripterror:
 		/* Remember this argument has been added to the argument list.
 		 * Needed when 'encoding' is changed. */
 		used_file_arg(argv[0], parmp->literal, parmp->full_path,
-							    parmp->diff_mode);
+# ifdef FEAT_DIFF
+							    parmp->diff_mode
+# else
+							    FALSE
+# endif
+							    );
 	    }
 #endif
 	}
diff --git a/src/version.c b/src/version.c
index cd69cfc02..f46ebda2c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    12,
 /**/
     11,
 /**/