diff -u nano/nano.c nano-enablestring/nano.c --- nano/nano.c Mon Feb 10 10:03:22 2003 +++ nano-enablestring/nano.c Mon Feb 10 10:14:29 2003 @@ -389,13 +389,13 @@ #ifndef NANO_SMALL /* If we're on the main list, we also count the toggle help text. - * Each line has "M-%c\t\t\t", which fills 24 columns, plus at most - * COLS - 24 characters, plus '\n'.*/ + * Each line has "M-%c\t\t\t", which fills 24 columns, plus t->desc + * and "enable/disable", plus '\n'.*/ if (currshortcut == main_list) { - size_t endislen = strlen(_("enable/disable")); + size_t endislen = strlen(_("%.*s enable/disable\n")); for (t = toggles; t != NULL; t = t->next) - allocsize += 8 + strlen(t->desc) + endislen; + allocsize += 6 + strlen(t->desc) + endislen; } #endif /* !NANO_SMALL */ @@ -460,9 +460,9 @@ /* And the toggles... */ if (currshortcut == main_list) for (t = toggles; t != NULL; t = t->next) { + ptr += sprintf(ptr, "M-%c\t\t\t", t->val - 32); assert(t->desc != NULL); - ptr += sprintf(ptr, "M-%c\t\t\t%s %s\n", t->val - 32, t->desc, - _("enable/disable")); + ptr += sprintf(ptr, _("%.*s enable/disable\n"), INT_MAX, t->desc); } #endif /* !NANO_SMALL */