patch 9.1.1707: diff.pro contains #ifdefs
Commit:
https://github.com/vim/vim/commit/b27f54965d72d5f4be194d50a7aea7fdb6ad8194
Author: Hirohito Higashi <[email protected]>
Date: Fri Aug 29 17:52:39 2025 +0200
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
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/version.c b/src/version.c
index df58dfd3c..ee6e5b817 100644
--- 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,
/**/
--
--
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 [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1us1WJ-009UOL-F2%40256bit.org.
