summaryrefslogtreecommitdiff
path: root/src/diff.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-05 21:18:27 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-05 21:18:27 +0100
commita6c07603ca2fa98a4184f5fd5ab021adcf5156b2 (patch)
treefd78ab3e8ea373d8bf6b3f4e398e71f03681fee9 /src/diff.c
parentf7e894dfb60b6fd8f426aa3da1452803f8de010c (diff)
downloadvim-git-a6c07603ca2fa98a4184f5fd5ab021adcf5156b2.tar.gz
patch 8.0.0425: build errors when building without foldingv8.0.0425
Problem: Build errors when building without folding. Solution: Add #ifdefs. (John Marriott)
Diffstat (limited to 'src/diff.c')
-rw-r--r--src/diff.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c
index 8d7421dd7..b64b45ce9 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -2616,7 +2616,6 @@ diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
return lnum;
}
-#if defined(FEAT_FOLDING) || defined(PROTO)
/*
* For line "lnum" in the current window find the equivalent lnum in window
* "wp", compensating for inserted/deleted lines.
@@ -2656,6 +2655,5 @@ diff_lnum_win(linenr_T lnum, win_T *wp)
n = dp->df_lnum[i] + dp->df_count[i];
return n;
}
-#endif
#endif /* FEAT_DIFF */