Mercurial > vim
changeset 12353:730e802bd3b1 v8.0.1056
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 04 Sep 2017 23:30:04 +0200 |
| parents | 5dc0465b70d5 |
| children | bd68fad23c41 |
| files | src/diff.c src/version.c |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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));