mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-12-27 20:59:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming and reordering most of 'help_line_len()'.

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5363 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2015-08-16 12:20:24 +00:00
parent 9e438cdce1
commit a5b29539b1
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@
* src/help.c (help_line_len): The wrap location can be beyond the EOL, * src/help.c (help_line_len): The wrap location can be beyond the EOL,
so for determining the length of the current line, don't start at that so for determining the length of the current line, don't start at that
location but at the beginning. This fixes Savannah bug #45770. location but at the beginning. This fixes Savannah bug #45770.
* src/help.c (help_line_len): Rename and reorder most of it.
2015-08-13 Benno Schulenberg <bensberg@justemail.net> 2015-08-13 Benno Schulenberg <bensberg@justemail.net>
* src/search.c (do_find_bracket): Remove mistaken comparison between * src/search.c (do_find_bracket): Remove mistaken comparison between

32
src/help.c
View File

@ -501,30 +501,30 @@ functionptrtype parse_help_input(int *kbinput)
/* Calculate the displayable length of the help-text line starting at ptr. */ /* Calculate the displayable length of the help-text line starting at ptr. */
size_t help_line_len(const char *ptr) size_t help_line_len(const char *ptr)
{ {
int help_cols = (COLS > 24) ? COLS - 1 : 24; size_t wrapping_point = (COLS > 24) ? COLS - 1 : 24;
/* The target width for wrapping long lines. */ /* The target width for wrapping long lines. */
ssize_t wrap_location;
/* Actual position where the line can be wrapped. */
size_t length = 0;
/* Full length of the line, until the first newline. */
/* Avoid overwide paragraphs in the introductory text. */ /* Avoid overwide paragraphs in the introductory text. */
if (ptr < end_of_intro && COLS > 74) if (ptr < end_of_intro && COLS > 74)
help_cols = 74; wrapping_point = 74;
ssize_t wrap_loc = break_line(ptr, help_cols, TRUE); wrap_location = break_line(ptr, wrapping_point, TRUE);
size_t retval = (wrap_loc < 0) ? 0 : wrap_loc;
size_t retval_save = retval;
retval = 0;
/* Get the length of the entire line up to a null or a newline. */ /* Get the length of the entire line up to a null or a newline. */
while (*(ptr + retval) != '\0' && *(ptr + retval) != '\n') while (*(ptr + length) != '\0' && *(ptr + length) != '\n')
retval += move_mbright(ptr + retval, 0); length = move_mbright(ptr, length);
/* If the entire line doesn't go more than one column beyond where /* If the entire line will just fit the screen, don't wrap it. */
* we tried to break it, we should display it as-is. Otherwise, we if (strnlenpt(ptr, length) <= wrapping_point + 1)
* should display it only up to the break. */ return length;
if (strnlenpt(ptr, retval) > help_cols + 1) else if (wrap_location > 0)
retval = retval_save; return wrap_location;
else
return retval; return 0;
} }
#endif /* !DISABLE_HELP */ #endif /* !DISABLE_HELP */