merge-recursive: separate out xdl_merge() interface.

diff --git a/utf8.h b/utf8.h
index cae2a8e665c2cbe7bf31a49deed84250eaa37a33..15db6f1f27ef7a1f056d5b6adca901f092036f82 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -3,7 +3,9 @@
 
 int utf8_width(const char **start);
 int is_utf8(const char *text);
-void print_wrapped_text(const char *text, int indent, int indent2, int len);
+int is_encoding_utf8(const char *name);
+
+int print_wrapped_text(const char *text, int indent, int indent2, int len);
 
 #ifndef NO_ICONV
 char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);