# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1504560604 -7200
# Node ID 730e802bd3b1b0185a9dc7f4218176032f119119
# Parent  5dc0465b70d59a96774499e5d70b2a8f28e23daa
patch 8.0.1056: cannot build with +diff but without +multi_byte

commit https://github.com/vim/vim/commit/6e32f615eb824048a98666d1da4416bbeb7b2bed
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Sep 4 23:21:07 2017 +0200

    patch 8.0.1056: cannot build with +diff but without +multi_byte

    Problem:    Cannot build with the diff feature but without the mutli-byte
                feature.
    Solution:   Remove #ifdefs. (John Marriott)

diff --git a/src/diff.c b/src/diff.c
--- a/src/diff.c
+++ b/src/diff.c
@@ -1702,9 +1702,7 @@ diff_equal_char(char_u *p1, char_u *p2, 
 diff_cmp(char_u *s1, char_u *s2)
 {
     char_u	*p1, *p2;
-#ifdef FEAT_MBYTE
     int		l;
-#endif
 
     if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0)
 	return STRCMP(s1, s2);
@@ -1983,10 +1981,8 @@ diff_find_change(
     int		idx;
     int		off;
     int		added = TRUE;
-#ifdef FEAT_MBYTE
     char_u	*p1, *p2;
     int		l;
-#endif
 
     /* Make a copy of the line, the next ml_get() will invalidate it. */
     line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1056,
+/**/
     1055,
 /**/
     1054,