patch 9.1.1707: diff.pro contains #ifdefs

Problem:  diff.pro contains #ifdefs
Solution: Remove unintentionally added ifdefs
          (Hirohito Higashi)

closes: #18164

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/proto/diff.pro b/src/proto/diff.pro
index e87e81b8c422ad4ee6e614ad610dd21c448a5be6..3a4929b0ccfba53a1d276e3a0df660a3a9e56b79 100644 (file)
--- a/src/proto/diff.pro
+++ b/src/proto/diff.pro
@@ -22,10 +22,8 @@ int diffopt_horizontal(void);
 int diffopt_hiddenoff(void);
 int diffopt_closeoff(void);
 void diff_update_line(linenr_T lnum);
-#ifdef FEAT_DIFF
 int diff_change_parse(diffline_T *diffline, diffline_change_T *change, int *change_start, int *change_end);
 int diff_find_change(win_T *wp, linenr_T lnum, diffline_T *diffline);
-#endif
 int diff_infold(win_T *wp, linenr_T lnum);
 void nv_diffgetput(int put, long count);
 void ex_diffgetput(exarg_T *eap);

diff --git a/src/version.c b/src/version.c
index df58dfd3cccb733b991a4890b675a83985b44edc..ee6e5b817c8a2db58f793e10e4bd4abf8e979ee3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1707,
 /**/
     1706,
 /**/