From 6babc805c1a81cb527fda815ce4676913edecdc3 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Fri, 15 Feb 2008 01:28:26 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@891 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/testdir/test39.in | 2 ++
 src/version.c         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/testdir/test39.in b/src/testdir/test39.in
index a16d4d99..d39ba82d 100644
--- a/src/testdir/test39.in
+++ b/src/testdir/test39.in
@@ -5,6 +5,8 @@ And test "U" in Visual mode, also on German sharp S.
 STARTTEST
 :so small.vim
 :so mbyte.vim
+:" This only works when 'encoding' is "latin1", don't depend on the environment
+:set enc=latin1
 /^abcde
 :" Test shift-right of a block
 jlllljj>wlljlll>
diff --git a/src/version.c b/src/version.c
index 10be161a..2c3b9c6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    252,
+/**/
     251,
 /**/
     250,
-- 
2.11.4.GIT