Merge branch 'jx/utf8-printf-width'

Use a new helper that prints a message and counts its display width
to align the help messages parse-options produces.

* jx/utf8-printf-width:
  Add utf8_fprintf helper that returns correct number of columns

diff --cc parse-options.c
Simple merge

diff --cc utf8.c
Simple merge

diff --cc utf8.h
index a214238bdd70c6b4eb41edf6626c5b396489ab50,3ca85c7737bff0b3df449cc9dc32f32230b522e1..501b2bd9c4fd3fdce6dcbba1a3e3f7c0211d6c8f
--- 1/utf8.h
--- 2/utf8.h
+++ b/utf8.h
@@@ -8,10 -8,11 +8,11 @@@ int utf8_strwidth(const char *string)
  int is_utf8(const char *text);
  int is_encoding_utf8(const char *name);
  int same_encoding(const char *, const char *);
+ int utf8_fprintf(FILE *, const char *, ...);
  
 -int strbuf_add_wrapped_text(struct strbuf *buf,
 +void strbuf_add_wrapped_text(struct strbuf *buf,
                const char *text, int indent, int indent2, int width);
 -int strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
 +void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
                             int indent, int indent2, int width);
  
  #ifndef NO_ICONV