summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c10
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 68b530a22f..270d00c273 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 af276df8fe..0b8b1c04b2 100644
--- 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,