mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 21:01:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

in help_init(), make sure we have enough memory in all cases when

Browse Source 
displaying the shortcut and toggle lists; and wrap the shortcut list
help text, for consistency with the toggle help text


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3668 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey 2006-06-19 15:35:35 +00:00
parent df7aaed743
commit bd2c8f3d2d
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -262,6 +262,10 @@ CVS code -
- If one of the help strings ends in newlines followed by a
space, move the space to the next help string to make it
easier for translators to see. (Benno Schulenberg)
- Make sure we have enough memory in all cases when displaying
the shortcut and toggle lists. (DLR)
- Wrap the shortcut list help text, for consistency with the
toggle help text. (DLR, suggested by Benno Schulenberg)
parse_help_input()
- Add Space and - as aliases for PageDown and PageUp, for
consistency with the file browser. (DLR, suggested by Benno

30
src/help.c
View File

@ -383,22 +383,26 @@ void help_init(void)
if (htx[2] != NULL)
allocsize += strlen(htx[2]);
/* The space needed for the shortcut lists, at most COLS characters,
* plus one or two '\n's. */
allocsize += (COLS < 24 ? (24 * mb_cur_max()) :
((COLS + 2) * mb_cur_max())) * length_of_list(currshortcut);
/* Count the shortcut help text. Each entry has up to three keys,
* which fill 24 columns, plus translated text, plus one or two
* \n's. Note that the translated text is left out if there are 24
* or fewer columns. */
for (s = currshortcut; s != NULL; s = s->next) {
allocsize += (24 * mb_cur_max()) + 1;
if (COLS >= 24)
allocsize += strlen(s->help) + 1;
}
#ifndef NANO_TINY
/* If we're on the main list, we also count the toggle help text.
* Each entry has "M-%c\t\t\t", which fills 24 columns, plus a
* space, plus translated text, plus one or two '\n's. */
if (currshortcut == main_list) {
size_t endis_len = strlen(_("enable/disable"));
size_t endis_len = strlen(_("enable/disable")) + 1;
for (t = toggles; t != NULL; t = t->next)
if (t->val != TOGGLE_NO_KEY)
allocsize += strlen(t->desc) + endis_len + 8;
allocsize++;
allocsize += (24 * mb_cur_max()) + strlen(t->desc) +
endis_len + 2;
}
#endif
@ -526,14 +530,8 @@ void help_init(void)
}
}
if (COLS > 24) {
char *help_ptr = display_string(s->help, 0, COLS - 24,
FALSE);
ptr += sprintf(ptr, help_ptr);
free(help_ptr);
}
if (COLS > 24)
ptr += sprintf(ptr, "%s", s->help);
ptr += sprintf(ptr, "\n");