Go to the documentation of this file.
31 #define XDF_NEED_MINIMAL (1 << 0)
33 #define XDF_IGNORE_WHITESPACE (1 << 1)
34 #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
35 #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
36 #define XDF_IGNORE_CR_AT_EOL (1 << 4)
37 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
38 XDF_IGNORE_WHITESPACE_CHANGE | \
39 XDF_IGNORE_WHITESPACE_AT_EOL | \
42 #define XDF_IGNORE_BLANK_LINES (1 << 7)
44 #define XDF_PATIENCE_DIFF (1 << 14)
45 #define XDF_HISTOGRAM_DIFF (1 << 15)
46 #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
47 #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
49 #define XDF_INDENT_HEURISTIC (1 << 23)
52 #define XDL_EMIT_FUNCNAMES (1 << 0)
53 #define XDL_EMIT_NO_HUNK_HDR (1 << 1)
54 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
57 #define XDL_MERGE_MINIMAL 0
58 #define XDL_MERGE_EAGER 1
59 #define XDL_MERGE_ZEALOUS 2
60 #define XDL_MERGE_ZEALOUS_ALNUM 3
63 #define XDL_MERGE_FAVOR_OURS 1
64 #define XDL_MERGE_FAVOR_THEIRS 2
65 #define XDL_MERGE_FAVOR_UNION 3
68 #define XDL_MERGE_DIFF3 1
84 #if 0 // unused by Vim
85 regex_t **ignore_regex;
86 size_t ignore_regex_nr;
97 long old_begin,
long old_nr,
98 long new_begin,
long new_nr,
99 const char *
func,
long funclen);
103 typedef long (*
find_func_t)(
const char *
line,
long line_len,
char *buffer,
long buffer_size,
void *priv);
106 long start_b,
long count_b,
122 #include "../nvim/memory.h"
124 #define xdl_malloc(x) xmalloc((x))
125 #define xdl_free(ptr) xfree(ptr)
126 #define xdl_realloc(ptr,x) xrealloc((ptr),(x))
145 #define DEFAULT_CONFLICT_MARKER_SIZE 7
const char * ancestor
Definition: xdiff.h:140
int favor
Definition: xdiff.h:138
int marker_size
Definition: xdiff.h:136
unsigned long flags
Definition: xdiff.h:81
char_u * result
Definition: keycodes.c:883
void * priv
Definition: xdiff.h:95
struct s_mmbuffer mmbuffer_t
int style
Definition: xdiff.h:139
size_t size
Definition: regexp_nfa.c:5986
int(* out_line)(void *, mmbuffer_t *, int)
Definition: xdiff.h:100
size_t anchors_nr
Definition: xdiff.h:91
struct s_xdemitconf xdemitconf_t
struct s_bdiffparam bdiffparam_t
long xdl_mmfile_size(mmfile_t *mmf)
Definition: xutils.c:68
long interhunkctxlen
Definition: xdiff.h:111
struct s_xdemitcb xdemitcb_t
char * ptr
Definition: xdiff.h:71
const char * file1
Definition: xdiff.h:141
int(* out_hunk)(void *, long old_begin, long old_nr, long new_begin, long new_nr, const char *func, long funclen)
Definition: xdiff.h:96
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, xmparam_t const *xmp, mmbuffer_t *result)
void stream cb_data
Definition: wstream.c:62
long ctxlen
Definition: xdiff.h:110
int level
Definition: xdiff.h:137
char * ptr
Definition: xdiff.h:76
struct s_xmparam xmparam_t
xpparam_t xpp
Definition: xdiff.h:135
xdl_emit_hunk_consume_func_t hunk_func
Definition: xdiff.h:115
long(* find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv)
Definition: xdiff.h:103
void * find_func_priv
Definition: xdiff.h:114
long size
Definition: xdiff.h:72
void * xdl_mmfile_first(mmfile_t *mmf, long *size)
Definition: xutils.c:61
const char * file2
Definition: xdiff.h:142
fc func
Definition: userfunc.c:847
long bsize
Definition: xdiff.h:119
void const char * line
Definition: eval.c:6881
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb)
Definition: xdiffi.c:1064
long size
Definition: xdiff.h:77
find_func_t find_func
Definition: xdiff.h:113
unsigned long flags
Definition: xdiff.h:112
int(* xdl_emit_hunk_consume_func_t)(long start_a, long count_a, long start_b, long count_b, void *cb_data)
Definition: xdiff.h:105
struct s_xpparam xpparam_t
char ** anchors
Definition: xdiff.h:90