development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-02 15:48:44 +00:00
Code Issues Projects Releases Wiki Activity

print_wrapped_text(): allow hard newlines

Browse Source 
print_wrapped_text() will insert its own newlines. Up until now, if the
text passed to it contained newlines, they would not be handled properly
(the wrapping got confused after that).

The strategy is to replace a single new-line with a space, but keep double
new-lines so that already-wrapped text with empty lines between paragraphs
will be handled properly.

However, single new-line characters are only handled this way if the
character after it is an alphanumeric character, as per Linus' suggestion.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2007-11-11 14:14:15 +00:00 committed by Junio C Hamano
parent e79999b1a2
commit ae0b270230
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
utf8.c
View File

@ -310,6 +310,8 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
if (!c || isspace(c)) {
if (w < width || !space) {
const char *start = bol;
if (!c && text == start)
return w;
if (space)
start = space;
else
@ -317,13 +319,25 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
fwrite(start, text - start, 1, stdout);
if (!c)
return w;
else if (c == '\t')
w |= 0x07;
space = text;
if (c == '\t')
w |= 0x07;
else if (c == '\n') {
space++;
if (*space == '\n') {
putchar('\n');
goto new_line;
}
else if (!isalnum(*space))
goto new_line;
else
putchar(' ');
}
w++;
text++;
}
else {
new_line:
putchar('\n');
text = bol = space + isspace(*space);
space = NULL;