Merge branch 'jc/t1512-fix' into maint

diff --git a/utf8.h b/utf8.h
index 1f8ecad1e88451c622de08ea14414021da64f402..32a7bfb987dcc487bcfc49f1b9f2ab29803a0070 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -3,7 +3,9 @@
 
 typedef unsigned int ucs_char_t;  /* assuming 32bit int */
 
+size_t display_mode_esc_sequence_len(const char *s);
 int utf8_width(const char **start, size_t *remainder_p);
+int utf8_strnwidth(const char *string, int len, int skip_ansi);
 int utf8_strwidth(const char *string);
 int is_utf8(const char *text);
 int is_encoding_utf8(const char *name);
@@ -14,14 +16,29 @@ void strbuf_add_wrapped_text(struct strbuf *buf,
                const char *text, int indent, int indent2, int width);
 void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
                             int indent, int indent2, int width);
+void strbuf_utf8_replace(struct strbuf *sb, int pos, int width,
+                        const char *subst);
 
 #ifndef NO_ICONV
-char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv);
-char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
+char *reencode_string_iconv(const char *in, size_t insz,
+                           iconv_t conv, int *outsz);
+char *reencode_string_len(const char *in, int insz,
+                         const char *out_encoding,
+                         const char *in_encoding,
+                         int *outsz);
 #else
-#define reencode_string(a,b,c) NULL
+#define reencode_string_len(a,b,c,d,e) NULL
 #endif
 
+static inline char *reencode_string(const char *in,
+                                   const char *out_encoding,
+                                   const char *in_encoding)
+{
+       return reencode_string_len(in, strlen(in),
+                                  out_encoding, in_encoding,
+                                  NULL);
+}
+
 int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding);
 
 #endif