patch 9.1.1637: FEAT_DIFF used in diff.pro

Problem:  FEAT_DIFF used in diff.pro
Solution: Remove it from the diff protocol file
          (Yegappan Lakshmanan)

closes: #18005

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/proto.h b/src/proto.h
index e9e5efcbc5431c8d5499a9a93dda0cd7d7dd3310..3c34fe8132cf5b6d21651aba8509a6c525afbd1c 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -73,7 +73,9 @@ extern int _stricoll(char *a, char *b);
 # include "if_cscope.pro"
 # include "debugger.pro"
 # include "dict.pro"
+# ifdef FEAT_DIFF
 # include "diff.pro"
+# endif
 # include "linematch.pro"
 # include "digraph.pro"
 # include "drawline.pro"

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/structs.h b/src/structs.h
index 7748d57561573d61eccba2fec9f58e0d39d31658..d7b458077478587bfb34a6c263b380f9cc15e31e 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -3606,7 +3606,7 @@ struct file_buffer
 }; // file_buffer
 
 
-#ifdef FEAT_DIFF
+#if defined(FEAT_DIFF) || defined(PROTO)
 /*
  * Stuff for diff mode.
  */

diff --git a/src/version.c b/src/version.c
index 3c38765d4368be00082dd2d6aee264eea0e2b681..7e4682cc8caca351ce5742c9bb344739a5527a22 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1637,
 /**/
     1636,
 /**/