From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 14 Dec 2011 13:49:45 +0000 (+0100)
Subject: updated for version 7.3.374
X-Git-Tag: v7.3.374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b38e9ab4af90e54d80b3198b2a2ace503b966a28;p=vim

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 68b530a22..270d00c27 100644
--- 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 af276df8f..0b8b1c04b 100644
--- 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,
 /**/