ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Showing just two shortcuts per function, to pull 

the explanatory lines closer to the key combos.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4807 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-22 20:10:43 +00:00
parent 9c0f9de7c5
commit cb7d11b3cf
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -10,6 +10,8 @@
in the list of shortcuts is enough. in the list of shortcuts is enough.
* src/global.c (shortcut_init): Put left/right in normal order. * src/global.c (shortcut_init): Put left/right in normal order.
* src/global.c (shortcut_init): List function key after meta key. * src/global.c (shortcut_init): List function key after meta key.
* src/help.c (help_init): Show just two shortcuts per function --
only three functions showed three, but who has an F13, F14, F15?
2014-04-21 Benno Schulenberg <bensberg@justemail.net> 2014-04-21 Benno Schulenberg <bensberg@justemail.net>
* doc/syntax/nanorc.nanorc: There is no F0 key. * doc/syntax/nanorc.nanorc: There is no F0 key.

32
src/help.c
View File

@ -423,11 +423,10 @@ void help_init(void)
if (!f->desc || !strcmp(f->desc, "")) if (!f->desc || !strcmp(f->desc, ""))
continue; continue;
/* Let's just try and use the first 3 shortcuts from the new /* Let's simply show the first two shortcuts from the list. */
* struct... */
for (s = sclist, scsfound = 0; s != NULL; s = s->next) { for (s = sclist, scsfound = 0; s != NULL; s = s->next) {
if (scsfound == 3) if (scsfound == 2)
continue; continue;
if (s->type == RAWINPUT) if (s->type == RAWINPUT)
@ -438,18 +437,21 @@ void help_init(void)
if (s->scfunc == f->scfunc) { if (s->scfunc == f->scfunc) {
scsfound++; scsfound++;
/* Make the first column narrower (6) than the second (10),
* but allow it to spill into the second, for "M-Space". */
if (scsfound == 1) {
sprintf(ptr, "%s ", s->keystr);
ptr += 6;
} else {
ptr += sprintf(ptr, "(%s)\t", s->keystr);
}
}
}
if (scsfound == 1) if (scsfound == 0)
ptr += sprintf(ptr, "%s", s->keystr); ptr += sprintf(ptr, "\t\t");
else else if (scsfound == 1)
ptr += sprintf(ptr, "(%s)", s->keystr); ptr += 10;
*(ptr++) = '\t';
}
}
/* Pad with tabs if we didn't find 3. */
for (; scsfound < 3; scsfound++) {
*(ptr++) = '\t';
}
/* The shortcut's help text. */ /* The shortcut's help text. */
ptr += sprintf(ptr, "%s\n", _(f->help)); ptr += sprintf(ptr, "%s\n", _(f->help));
@ -463,7 +465,7 @@ void help_init(void)
if (currmenu == MMAIN) if (currmenu == MMAIN)
for (s = sclist; s != NULL; s = s->next) for (s = sclist; s != NULL; s = s->next)
if (s->scfunc == do_toggle_void) if (s->scfunc == do_toggle_void)
ptr += sprintf(ptr, "(%s)\t\t\t%s %s\n", ptr += sprintf(ptr, "(%s)\t\t%s %s\n",
s->keystr, _(flagtostr(s->toggle)), _("enable/disable")); s->keystr, _(flagtostr(s->toggle)), _("enable/disable"));
#ifndef DISABLE_NANORC #ifndef DISABLE_NANORC