diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2024-02-03 17:41:54 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-03 17:41:54 +0100 |
| commit | 609370392a7b88dc2db38d01577509575216ff36 (patch) | |
| tree | 09f3f29990d8391482b54d925acd8879b7a1d458 /src/diff.c | |
| parent | 2d205d0a954a3ecdfbcd7bb44fa50557119d8a85 (diff) | |
patch 9.1.0072: Not able to build without FEAT_DIFFv9.1.0072
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>
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/diff.c b/src/diff.c index cb894ca532..eedd76b133 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 |