aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.1.0072: Not able to build without FEAT_DIFF

Browse Source 
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 <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2024-02-03 17:41:54 +01:00
committed by Christian Brabandt
parent 2d205d0a95
commit 609370392a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/diff.c
View File

@@ -3394,12 +3394,12 @@ xdiff_out_unified(
void void
f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED) 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) if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
return; return;
rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars)); 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 void
f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED) f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{ {
#ifdef FEAT_DIFF # ifdef FEAT_DIFF
linenr_T lnum; linenr_T lnum;
static linenr_T prev_lnum = 0; static linenr_T prev_lnum = 0;
static varnumber_T changedtick = 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 hlID = HLF_CHD; // changed line
} }
rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID; 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 * Parse the diff options passed in "optarg" to the diff() function and return
* the options in "diffopts" and the diff algorithm in "diffalgo". * the options in "diffopts" and the diff algorithm in "diffalgo".
@@ -3575,6 +3576,7 @@ get_diff_hunk_indices(diffhunk_T *hunk)
return hunk_dict; return hunk_dict;
} }
# endif
/* /*
* "diff()" function * "diff()" function
@@ -3582,7 +3584,7 @@ get_diff_hunk_indices(diffhunk_T *hunk)
void void
f_diff(typval_T *argvars UNUSED, typval_T *rettv UNUSED) f_diff(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{ {
#ifdef FEAT_DIFF # ifdef FEAT_DIFF
diffio_T dio; diffio_T dio;
if (check_for_nonnull_list_arg(argvars, 0) == FAIL if (check_for_nonnull_list_arg(argvars, 0) == FAIL
@@ -3664,7 +3666,7 @@ done:
diff_flags = save_diff_flags; diff_flags = save_diff_flags;
diff_algorithm = save_diff_algorithm; diff_algorithm = save_diff_algorithm;
diff_internal_output_fmt = save_diff_output_fmt; diff_internal_output_fmt = save_diff_output_fmt;
#endif # endif
} }
#endif #endif

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
72,
/**/ /**/
71, 71,
/**/ /**/