Merge branch 'maint'

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index deebe02cd3489ef3ce94b407ff9c3de4c21a0eb1..84fff583e2a6e3411da4260b9af98043fade1e49 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -87,6 +87,7 @@ typedef struct s_xdemitconf {
        unsigned long flags;
        find_func_t find_func;
        void *find_func_priv;
+       void (*emit_func)();
 } xdemitconf_t;
 
 typedef struct s_bdiffparam {