commit 15d0a8c77dad867b69822e2fd8f9f6bbcf765c48
author Bram Moolenaar <Bram@vim.org> Mon Sep 06 17:44:46 2004 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Sep 06 17:44:46 2004 +0000
tree e84faedc007f9c2b81b9056a400dccade2b947e5
parent d4755bb0e04fca334675f1503bd6474b017a9bba

updated for version 7.0015

src/mbyte.c

diff --git a/src/mbyte.c b/src/mbyte.c
index 407f667..a71fb51 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -426,6 +426,9 @@
     vimconv_T	vimconv;
     char_u	*p;
 #endif
+#ifdef WIN32
+    int		prev_enc_utf8 = enc_utf8;
+#endif
 
     if (p_enc == NULL)
     {
@@ -684,6 +687,17 @@
 					  enc_utf8 ? "utf-8" : (char *)p_enc);
 #endif
 
+#ifdef WIN32
+    /* When changing 'encoding' while starting up, then convert the command
+     * line arguments from the active codepage to 'encoding'. */
+    if (starting != 0)
+    {
+	extern void fix_arg_enc(void);
+
+	fix_arg_enc();
+    }
+#endif
+
 #ifdef FEAT_AUTOCMD
     /* Fire an autocommand to let people do custom font setup. This must be
      * after Vim has been setup for the new encoding. */