commit b38e9ab4af90e54d80b3198b2a2ace503b966a28
author Bram Moolenaar <Bram@vim.org> Wed Dec 14 14:49:45 2011 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Dec 14 14:49:45 2011 +0100
tree 6ab08cd5eb0f9ebe6d187b22c743ad1a4ecb745c
parent 08fc756582a54958e32a6fda9e978e469d1ef7bc

updated for version 7.3.374
Problem:    ++encoding does not work properly.
Solution:   Recognize ++encoding before ++enc. (Charles Cooper)

src/ex_docmd.c

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 68b530a..270d00c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4840,12 +4840,10 @@
 #ifdef FEAT_MBYTE
     else if (STRNCMP(arg, "enc", 3) == 0)
     {
-	arg += 3;
-	pp = &eap->force_enc;
-    }
-    else if (STRNCMP(arg, "encoding", 8) == 0)
-    {
-	arg += 8;
+	if (STRNCMP(arg, "encoding", 8) == 0)
+	    arg += 8;
+	else
+	    arg += 3;
 	pp = &eap->force_enc;
     }
     else if (STRNCMP(arg, "bad", 3) == 0)

src/version.c

diff --git a/src/version.c b/src/version.c
index af276df..0b8b1c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    374,
+/**/
     373,
 /**/
     372,