Merge branch 'sp/shortlog-missing-lf' into maint

* sp/shortlog-missing-lf:
  strbuf_add_wrapped*(): Remove unused return value
  shortlog: fix wrapping lines of wraplen

diff --cc builtin/shortlog.c
Simple merge

diff --cc utf8.c
Simple merge

diff --cc utf8.h
index 93ef60042c2fad93184b573f30e771ecddc842be,f50c567d4202142325ce7a7f991b42775ff0fca5..a214238bdd70c6b4eb41edf6626c5b396489ab50
--- 1/utf8.h
--- 2/utf8.h
+++ b/utf8.h
@@@ -7,11 -7,10 +7,11 @@@ int utf8_width(const char **start, size
  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 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