thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
Problem:    Cannot build with the diff feature but without the mutli-byte
            feature.
Solution:   Remove #ifdefs. (John Marriott)
This commit is contained in:
Bram Moolenaar
2017-09-04 23:21:07 +02:00
parent 11aa62f8f9
commit 6e32f615eb
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.c
View File

@@ -1702,9 +1702,7 @@ diff_equal_char(char_u *p1, char_u *p2, int *len)
diff_cmp(char_u *s1, char_u *s2) diff_cmp(char_u *s1, char_u *s2)
{ {
char_u *p1, *p2; char_u *p1, *p2;
#ifdef FEAT_MBYTE
int l; int l;
#endif
if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0) if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0)
return STRCMP(s1, s2); return STRCMP(s1, s2);
@@ -1983,10 +1981,8 @@ diff_find_change(
int idx; int idx;
int off; int off;
int added = TRUE; int added = TRUE;
#ifdef FEAT_MBYTE
char_u *p1, *p2; char_u *p1, *p2;
int l; int l;
#endif
/* Make a copy of the line, the next ml_get() will invalidate it. */ /* 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)); line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1056,
/**/ /**/
1055, 1055,
/**/ /**/