diff -ur nano-cvs/src/help.c nano-new/src/help.c --- nano-cvs/src/help.c 2006-06-09 21:28:19.000000000 +0200 +++ nano-new/src/help.c 2006-06-19 15:33:12.000000000 +0200 @@ -434,7 +434,7 @@ /* Yucky sentinel values that we can't handle a better * way. */ if (s->ctrlval == NANO_CONTROL_SPACE) { - char *space_ptr = display_string(_("Space"), 0, 14, + char *space_ptr = display_string(_("Space"), 0, 13, FALSE); if (s->funcval == NANO_NO_KEY && (s->metaval == @@ -443,21 +443,21 @@ * of blank space. If this entry takes up more than * one entry's worth of space, use two to display * it. */ - if (mbstrlen(space_ptr) > 6) + if (mbstrlen(space_ptr) > 5) entries++; } else /* Otherwise, truncate it so that it takes up only * one entry's worth of space. */ - space_ptr[6] = '\0'; + space_ptr[5] = '\0'; - ptr += sprintf(ptr, "^%s", space_ptr); + ptr += sprintf(ptr, " ^%s", space_ptr); free(space_ptr); } else if (s->ctrlval == NANO_CONTROL_8) - ptr += sprintf(ptr, "^?"); + ptr += sprintf(ptr, " ^?"); /* Normal values. */ else - ptr += sprintf(ptr, "^%c", s->ctrlval + 64); + ptr += sprintf(ptr, " ^%c", s->ctrlval + 64); *(ptr++) = '\t'; } @@ -485,21 +485,21 @@ /* Yucky sentinel values that we can't handle a better * way. */ if (s->metaval == NANO_ALT_SPACE && entries == 1) { - char *space_ptr = display_string(_("Space"), 0, 13, + char *space_ptr = display_string(_("Space"), 0, 12, FALSE); /* If we're here, we have at least two entries worth of * blank space. If this entry takes up more than one * entry's worth of space, use two to display it. */ - if (mbstrlen(space_ptr) > 5) + if (mbstrlen(space_ptr) > 4) entries++; - ptr += sprintf(ptr, "M-%s", space_ptr); + ptr += sprintf(ptr, " M-%s", space_ptr); free(space_ptr); } else /* Normal values. */ - ptr += sprintf(ptr, (entries == 1) ? "M-%c" : "(M-%c)", + ptr += sprintf(ptr, (entries == 1) ? " M-%c" : "(M-%c)", toupper(s->metaval)); *(ptr++) = '\t'; } @@ -547,7 +547,7 @@ if (currshortcut == main_list) { for (t = toggles; t != NULL; t = t->next) { if (t->val != TOGGLE_NO_KEY) - ptr += sprintf(ptr, "M-%c\t\t\t%s %s", + ptr += sprintf(ptr, " M-%c\t\t\t%s %s", toupper(t->val), t->desc, _("enable/disable")); ptr += sprintf(ptr, "\n");