patch 9.1.0072: Not able to build without FEAT_DIFF
Commit:
https://github.com/vim/vim/commit/609370392a7b88dc2db38d01577509575216ff36
Author: Yegappan Lakshmanan <[email protected]>
Date: Sat Feb 3 17:41:54 2024 +0100
patch 9.1.0072: Not able to build without FEAT_DIFF
Problem: Not able to build without FEAT_DIFF
(John Marriott, after 9.1.0071)
Solution: Adjust #ifdefs
(Yegappan Lakshmanan)
closes: #13964
Signed-off-by: Yegappan Lakshmanan <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/diff.c b/src/diff.c
index cb894ca53..eedd76b13 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -3394,12 +3394,12 @@ xdiff_out_unified(
void
f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{
-#ifdef FEAT_DIFF
+# ifdef FEAT_DIFF
if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
return;
rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
-#endif
+# endif
}
/*
@@ -3408,7 +3408,7 @@ f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv
UNUSED)
void
f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{
-#ifdef FEAT_DIFF
+# ifdef FEAT_DIFF
linenr_T lnum;
static linenr_T prev_lnum = 0;
static varnumber_T changedtick = 0;
@@ -3463,9 +3463,10 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv
UNUSED)
hlID = HLF_CHD; // changed line
}
rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
-#endif
+# endif
}
+# ifdef FEAT_DIFF
/*
* Parse the diff options passed in "optarg" to the diff() function and return
* the options in "diffopts" and the diff algorithm in "diffalgo".
@@ -3575,6 +3576,7 @@ get_diff_hunk_indices(diffhunk_T *hunk)
return hunk_dict;
}
+# endif
/*
* "diff()" function
@@ -3582,7 +3584,7 @@ get_diff_hunk_indices(diffhunk_T *hunk)
void
f_diff(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{
-#ifdef FEAT_DIFF
+# ifdef FEAT_DIFF
diffio_T dio;
if (check_for_nonnull_list_arg(argvars, 0) == FAIL
@@ -3664,7 +3666,7 @@ done:
diff_flags = save_diff_flags;
diff_algorithm = save_diff_algorithm;
diff_internal_output_fmt = save_diff_output_fmt;
-#endif
+# endif
}
#endif
diff --git a/src/version.c b/src/version.c
index ad3d04bb8..653533c3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 72,
/**/
71,
/**/
--
--
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 on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rWJN4-00BWmn-T4%40256bit.org.
