From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 2 Dec 2009 16:47:11 +0000 (+0000)
Subject: updated for version 7.2-314
X-Git-Tag: v7.2.314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7cd61723e099bb6b743d1d901dee2257ec315da;p=vim

updated for version 7.2-314
---

diff --git a/src/misc1.c b/src/misc1.c
index 7da8701cb..3da0d9aef 100644
--- 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 80aeaa3db..376a78a38 100644
--- 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,
 /**/