From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 28 Jul 2013 13:16:19 +0000 (+0200)
Subject: updated for version 7.4a.046
X-Git-Tag: v7.4a.046
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2320f43ea9d3991e3dc2dd8595a7dfb76138093;p=thirdparty%2Fvim.git

updated for version 7.4a.046
Problem:    Can't build without mbyte feature.
Solution:   Add #ifdefs.
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c08bb21cb2..66e1702083 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3453,7 +3453,9 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
 		    if (!oldbuf && eap != NULL)
 		    {
 			set_file_options(TRUE, eap);
+#ifdef FEAT_MBYTE
 			set_forced_fenc(eap);
+#endif
 		    }
 		}
 
diff --git a/src/version.c b/src/version.c
index da09f6e2bb..07716b544b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    46,
 /**/
     45,
 /**/