mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

help: increase the minimum help-text width from 32 to 40 columns 

Getting long words like "Rechtschreibprüfung" broken somewhere in
the middle doesn't look nice.
This commit is contained in:
Benno Schulenberg 2020-03-15 14:04:57 +01:00
parent 16f17f3f1b
commit 01d8b0e15d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/help.c
View File

@ -44,7 +44,7 @@ void wrap_help_text_into_buffer(void)
{ {
size_t sum = 0; size_t sum = 0;
/* Avoid overtight and overwide paragraphs in the introductory text. */ /* Avoid overtight and overwide paragraphs in the introductory text. */
size_t wrapping_point = (COLS < 32) ? 32 : (COLS > 74) ? 74 : COLS; size_t wrapping_point = (COLS < 40) ? 40 : (COLS > 74) ? 74 : COLS;
const char *ptr = start_of_body; const char *ptr = start_of_body;
make_new_buffer(); make_new_buffer();
@ -55,10 +55,10 @@ void wrap_help_text_into_buffer(void)
char *oneline; char *oneline;
if (ptr == end_of_intro) if (ptr == end_of_intro)
wrapping_point = (COLS < 32) ? 32 : COLS; wrapping_point = (COLS < 40) ? 40 : COLS;
if (ptr > end_of_intro && *(ptr - 1) != '\n') { if (ptr > end_of_intro && *(ptr - 1) != '\n') {
length = break_line(ptr, (COLS < 32) ? 14 : COLS - 18, TRUE); length = break_line(ptr, (COLS < 40) ? 22 : COLS - 18, TRUE);
oneline = nmalloc(length + 5); oneline = nmalloc(length + 5);
snprintf(oneline, length + 5, "\t\t %s", ptr); snprintf(oneline, length + 5, "\t\t %s", ptr);
} else { } else {

2
src/text.c
View File

@ -1371,7 +1371,7 @@ ssize_t break_line(const char *textstart, ssize_t goal, bool snap_at_nl)
/* Find the last blank that does not overshoot the target column. /* Find the last blank that does not overshoot the target column.
* When treating a help text, do not break in the keystrokes area. */ * When treating a help text, do not break in the keystrokes area. */
while (*pointer != '\0' && ((ssize_t)column <= goal)) { while (*pointer != '\0' && ((ssize_t)column <= goal)) {
if (is_blank_char(pointer) && (!inhelp || column > 17 || goal < 32)) if (is_blank_char(pointer) && (!inhelp || column > 17 || goal < 40))
lastblank = pointer; lastblank = pointer;
#ifdef ENABLE_HELP #ifdef ENABLE_HELP
else if (snap_at_nl && *pointer == '\n') { else if (snap_at_nl && *pointer == '\n') {