diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-12-14 14:49:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-12-14 14:49:45 +0100 |
| commit | 1ff876516cf4dae8979ad9555583c4c44dd73dcd (patch) | |
| tree | ad59edf8d9b630369cb649c2de1a2b2d31920f92 /src | |
| parent | 6e4f52e06a7628b1f5b4ee48bf9a988d939ea801 (diff) | |
| download | vim-1ff876516cf4dae8979ad9555583c4c44dd73dcd.tar.gz | |
Problem: ++encoding does not work properly.
Solution: Recognize ++encoding before ++enc. (Charles Cooper)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_docmd.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 68b530a2..270d00c2 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 af276df8..0b8b1c04 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, |