updated for version 7.3.374

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

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 68b530a22f6b1a9290aedc36af1df365b109a523..270d00c2738e53d927976237e6bf1b610842b315 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4840,12 +4840,10 @@ getargopt(eap)
 #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)

diff --git a/src/version.c b/src/version.c
index af276df8fe7f3bbbfd8d3f5d46237662ffaec2fc..0b8b1c04b26222c793dfe88977dfd6bcd2603555 100644 (file)
--- 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 */
+/**/
+    374,
 /**/
     373,
 /**/