changeset 10642:c10f367d0dfc v8.0.0211

patch 8.0.0211: cannot build without the multi-byte feature commit https://github.com/vim/vim/commit/560379d7ae1bace259bbc29a275e73446346ce66 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 21 22:50:00 2017 +0100 patch 8.0.0211: cannot build without the multi-byte feature Problem: Build fails if the multi-byte feature is disabled. Solution: Change #ifdef around ins_char_bytes.
author Christian Brabandt <cb@256bit.org>
date Sat, 21 Jan 2017 23:00:04 +0100
parents bcd353707cfc
children 9eee1718dcc6
files src/misc1.c src/version.c
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {
+    char_u	buf[MB_MAXBYTES + 1];
+    int		n = 1;
+
 #if defined(FEAT_MBYTE) || defined(PROTO)
-    char_u	buf[MB_MAXBYTES + 1];
-    int		n;
-
     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)
     {
--- 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,