patch 9.1.1637: FEAT_DIFF used in diff.pro
Commit:
https://github.com/vim/vim/commit/3281a0ae62be9e48ce4ef1c9cc89503bf5f2bb04
Author: Yegappan Lakshmanan <yegap...@yahoo.com>
Date: Sat Aug 16 17:33:53 2025 +0200
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 <yegap...@yahoo.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/proto.h b/src/proto.h
index e9e5efcbc..3c34fe813 100644
--- 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 e87e81b8c..3a4929b0c 100644
--- 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 7748d5756..d7b458077 100644
--- 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 3c38765d4..7e4682cc8 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1unJ5b-0016Fz-PI%40256bit.org.
