Mercurial > vim

changeset 3208:0a9d7cf90f94 v7.3.374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.374 Problem: ++encoding does not work properly. Solution: Recognize ++encoding before ++enc. (Charles Cooper)
author Bram Moolenaar <bram@vim.org>
date Wed, 14 Dec 2011 14:49:45 +0100
parents 13324669e79b
children 7104cd9e82c1
files src/ex_docmd.c src/version.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    374,
+/**/
     373,
 /**/
     372,