diff options
| author | vimboss <devnull@localhost> | 2009-12-02 16:47:11 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-12-02 16:47:11 +0000 |
| commit | 0ce79e3fea2813f8217d2644bd01b3781b2bf5b3 (patch) | |
| tree | 38abd31ef8d5b15a0089cd9fc22e0240a4deb7c1 | |
| parent | ba52c5fae4a992b01f11097fb8a1ca82545f0e3e (diff) | |
| download | vim-7.2.314.tar.gz | |
| -rw-r--r-- | src/misc1.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c index 7da8701c..3da0d9ae 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 80aeaa3d..376a78a3 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 314, +/**/ 313, /**/ 312, |