diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-21 22:50:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-21 22:50:00 +0100 |
| commit | 560379d7ae1bace259bbc29a275e73446346ce66 (patch) | |
| tree | 5f07d655c8e9c7e59053fb5ecafa38f6548b4a83 | |
| parent | ec2da36ca48b40c0654b32a8d2c9f52e796daa5e (diff) | |
patch 8.0.0211: cannot build without the multi-byte featurev8.0.0211
Problem: Build fails if the multi-byte feature is disabled.
Solution: Change #ifdef around ins_char_bytes.
| -rw-r--r-- | src/misc1.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/misc1.c b/src/misc1.c index 01734c4e0a..046e2f0671 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2177,16 +2177,19 @@ ins_bytes_len(char_u *p, int len) void ins_char(int c) { -#if defined(FEAT_MBYTE) || defined(PROTO) char_u buf[MB_MAXBYTES + 1]; - int n; + int n = 1; +#if defined(FEAT_MBYTE) || defined(PROTO) n = (*mb_char2bytes)(c, buf); /* When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte. * Happens for CTRL-Vu9900. */ if (buf[0] == 0) buf[0] = '\n'; +#else + buf[0] = c; +#endif ins_char_bytes(buf, n); } @@ -2195,7 +2198,6 @@ ins_char(int c) ins_char_bytes(char_u *buf, int charlen) { int c = buf[0]; -#endif int newlen; /* nr of bytes inserted */ int oldlen; /* nr of bytes deleted (0 when not replacing) */ char_u *p; @@ -2218,11 +2220,7 @@ ins_char_bytes(char_u *buf, int charlen) /* The lengths default to the values for when not replacing. */ oldlen = 0; -#ifdef FEAT_MBYTE newlen = charlen; -#else - newlen = 1; -#endif if (State & REPLACE_FLAG) { diff --git a/src/version.c b/src/version.c index 927825cf77..8e33c9681a 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 211, +/**/ 210, /**/ 209, |