Skip to content

Commit 6093703

Browse files
yegappanchrisbra
authored andcommitted
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]>
1 parent 2d205d0 commit 6093703

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/diff.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3394,12 +3394,12 @@ xdiff_out_unified(
33943394
void
33953395
f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
33963396
{
3397-
#ifdef FEAT_DIFF
3397+
# ifdef FEAT_DIFF
33983398
if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
33993399
return;
34003400

34013401
rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
3402-
#endif
3402+
# endif
34033403
}
34043404

34053405
/*
@@ -3408,7 +3408,7 @@ f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
34083408
void
34093409
f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
34103410
{
3411-
#ifdef FEAT_DIFF
3411+
# ifdef FEAT_DIFF
34123412
linenr_T lnum;
34133413
static linenr_T prev_lnum = 0;
34143414
static varnumber_T changedtick = 0;
@@ -3463,9 +3463,10 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
34633463
hlID = HLF_CHD; // changed line
34643464
}
34653465
rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
3466-
#endif
3466+
# endif
34673467
}
34683468

3469+
# ifdef FEAT_DIFF
34693470
/*
34703471
* Parse the diff options passed in "optarg" to the diff() function and return
34713472
* the options in "diffopts" and the diff algorithm in "diffalgo".
@@ -3575,14 +3576,15 @@ get_diff_hunk_indices(diffhunk_T *hunk)
35753576

35763577
return hunk_dict;
35773578
}
3579+
# endif
35783580

35793581
/*
35803582
* "diff()" function
35813583
*/
35823584
void
35833585
f_diff(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
35843586
{
3585-
#ifdef FEAT_DIFF
3587+
# ifdef FEAT_DIFF
35863588
diffio_T dio;
35873589

35883590
if (check_for_nonnull_list_arg(argvars, 0) == FAIL
@@ -3664,7 +3666,7 @@ f_diff(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
36643666
diff_flags = save_diff_flags;
36653667
diff_algorithm = save_diff_algorithm;
36663668
diff_internal_output_fmt = save_diff_output_fmt;
3667-
#endif
3669+
# endif
36683670
}
36693671

36703672
#endif

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
72,
707709
/**/
708710
71,
709711
/**/

0 commit comments

Comments
 (0)