ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: improve two comments, and remove an unneeded one

master
Benno Schulenberg 2020-03-12 17:18:10 +01:00
parent f3b030c8e5
commit 6d720bf7b2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/text.c
View File

@ -1351,11 +1351,10 @@ bool do_wrap(void)
#endif /* ENABLE_WRAPPING */ #endif /* ENABLE_WRAPPING */
#if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY) #if defined(ENABLE_HELP) || defined(ENABLED_WRAPORJUSTIFY)
/* We are trying to break a chunk off line. We find the last blank such /* Find the last blank in the given piece of text such that the display width
* that the display length to there is at most (goal + 1). If there is * to that point is at most (goal + 1). When there is no such blank, then find
* no such blank, then we find the first blank. We then take the last * the first blank. Return the index of the last blank in that group of blanks.
* blank in that group of blanks. The terminating '\0' counts as a * When snap_at_nl is TRUE, a newline character counts as a blank too. */
* blank, as does a '\n' if snap_at_nl is TRUE. */
ssize_t break_line(const char *textstart, ssize_t goal, bool snap_at_nl) ssize_t break_line(const char *textstart, ssize_t goal, bool snap_at_nl)
{ {
const char *lastblank = NULL; const char *lastblank = NULL;
@ -1387,8 +1386,7 @@ ssize_t break_line(const char *textstart, ssize_t goal, bool snap_at_nl)
return (pointer - textstart); return (pointer - textstart);
#ifdef ENABLE_HELP #ifdef ENABLE_HELP
/* If we're wrapping a help text and no blank was found, or was /* When wrapping a help text and no blank was found, force a line break. */
* found only as the first character, force a line break. */
if (snap_at_nl && lastblank == NULL) if (snap_at_nl && lastblank == NULL)
return step_left(textstart, pointer - textstart); return step_left(textstart, pointer - textstart);
#endif #endif
@ -1404,7 +1402,6 @@ ssize_t break_line(const char *textstart, ssize_t goal, bool snap_at_nl)
pointer += char_length(pointer); pointer += char_length(pointer);
} }
/* Move the pointer back to the last blank, and then step beyond it. */
pointer = lastblank + char_length(lastblank); pointer = lastblank + char_length(lastblank);
/* Skip any consecutive blanks after the last blank. */ /* Skip any consecutive blanks after the last blank. */