diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-04 23:21:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-04 23:21:07 +0200 |
| commit | 6e32f615eb824048a98666d1da4416bbeb7b2bed (patch) | |
| tree | 17b9847dfa5048b9f5d7c0a848ba5765dda54868 | |
| parent | 11aa62f8f949bb590b4d7792a334885fba5e4137 (diff) | |
| download | vim-git-8.0.1056.tar.gz | |
patch 8.0.1056: cannot build with +diff but without +multi_bytev8.0.1056
Problem: Cannot build with the diff feature but without the mutli-byte
feature.
Solution: Remove #ifdefs. (John Marriott)
| -rw-r--r-- | src/diff.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/diff.c b/src/diff.c index 0e352d893..11952c743 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1702,9 +1702,7 @@ diff_equal_char(char_u *p1, char_u *p2, int *len) 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 index d15565f0a..652704c1b 100644 --- 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, |