From deaf7b739791095e2c98a7087dfe9b3c8dfd56f2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 30 Dec 2011 13:09:21 +0100
Subject: [PATCH] updated for version 7.3.387 Problem:    Test 83 may fail for
 some encodings. Solution:   Set 'encoding' to utf-8 earlier.

---
 src/testdir/test83.in | 2 +-
 src/version.c         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test83.in b/src/testdir/test83.in
index 09ef0b455..297d560d2 100644
--- a/src/testdir/test83.in
+++ b/src/testdir/test83.in
@@ -2,12 +2,12 @@ Tests for tag search with !_TAG_FILE_ENCODING.
 
 STARTTEST
 :so mbyte.vim
+:set enc=utf8
 :if !has('iconv') || iconv("\x82\x60", "cp932", "utf-8") != "\uff21"
 : e! test.ok
 : w! test.out
 : qa!
 :endif
-:set enc=utf8
 
 :/^text for tags1$/,/^text for tags1$/+1w! Xtags1.txt
 :/^text for tags2$/,/^text for tags2$/+1w! Xtags2.txt
diff --git a/src/version.c b/src/version.c
index 3d2d47ab7..50532c201 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    387,
 /**/
     386,
 /**/
-- 
2.50.1