summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorJan H. Schönherr <schnhrr@cs.tu-berlin.de>2012-10-18 16:43:28 +0200
committerJunio C Hamano <gitster@pobox.com>2012-10-18 14:20:49 -0700
commit14e1a4e1ff70aff36db3f5d2a8b806efd0134d50 (patch)
tree508e8594804778c6698a1acb5b1daf3fe1f96782 /utf8.c
parentbafc478f1618534fcb85bedc0fa224bd2d462441 (diff)
downloadgit-14e1a4e1ff70aff36db3f5d2a8b806efd0134d50.tar.gz
utf8: fix off-by-one wrapping of text
The wrapping logic in strbuf_add_wrapped_text() does currently not allow lines that entirely fill the allowed width, instead it wraps the line one character too early. For example, the text "This is the sixth commit." formatted via "%w(11,1,2)" (wrap at 11 characters, 1 char indent of first line, 2 char indent of following lines) results in four lines: " This is", " the", " sixth", " commit." This is wrong, because " the sixth" is exactly 11 characters long, and thus allowed. Fix this by allowing the (width+1) character of a line to be a valid wrapping point if it is a whitespace character. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'utf8.c')
-rw-r--r--utf8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utf8.c b/utf8.c
index 8acbc660d3..523a78a651 100644
--- a/utf8.c
+++ b/utf8.c
@@ -353,7 +353,7 @@ retry:
c = *text;
if (!c || isspace(c)) {
- if (w < width || !space) {
+ if (w <= width || !space) {
const char *start = bol;
if (!c && text == start)
return w;