updated for version 7.2-314

diff --git a/src/misc1.c b/src/misc1.c
index 7da8701cbad9fef93e4efe0441d962b196f1c01a..3da0d9aef507809d5cc80ff7586be2244f77df1a 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -4666,7 +4666,6 @@ concat_fnames(fname1, fname2, sep)
     return dest;
 }
 
-#if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
 /*
  * Concatenate two strings and return the result in allocated memory.
  * Returns NULL when out of memory.
@@ -4687,7 +4686,6 @@ concat_str(str1, str2)
     }
     return dest;
 }
-#endif
 
 /*
  * Add a path separator to a file name, unless it already ends in a path

diff --git a/src/version.c b/src/version.c
index 80aeaa3dbb44f873ab9b2044c60eccaa71287360..376a78a384b9774975ec2fbbbd22dc780adbd23e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    314,
 /**/
     313,
 /**/