summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-28 15:16:19 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-28 15:16:19 +0200
commita2320f43ea9d3991e3dc2dd8595a7dfb76138093 (patch)
treee9eb665b0eec709d716dd72e7a99eed341e83d29
parente855ccf90ae7910db3fa2ea3123ce9706636426a (diff)
downloadvim-git-a2320f43ea9d3991e3dc2dd8595a7dfb76138093.tar.gz
updated for version 7.4a.046v7.4a.046
Problem: Can't build without mbyte feature. Solution: Add #ifdefs.
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c08bb21cb..66e170208 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 da09f6e2b..07716b544 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 46,
+/**/
45,
/**/
44,