mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Putting meta first, for clarity. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4789 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-04-21 11:15:48 +00:00
parent e0149c1d9a
commit bb8c9031a4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* doc/syntax/nanorc.nanorc: There is no F0 key. * doc/syntax/nanorc.nanorc: There is no F0 key.
* src/global.c (first_sc_for): Adjust two comments -- the help * src/global.c (first_sc_for): Adjust two comments -- the help
viewer no longer sorts keys to be control first, meta second. viewer no longer sorts keys to be control first, meta second.
* src/global.c (first_sc_for): Put meta first, for clarity.
2014-04-16 Benno Schulenberg <bensberg@justemail.net> 2014-04-16 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (get_mouseinput): Properly find also the zeroeth * src/winio.c (get_mouseinput): Properly find also the zeroeth

16
src/global.c
View File

@ -323,14 +323,14 @@ const sc *first_sc_for(int menu, void (*func)(void))
* and first dedicated key. The latter is needed to be * and first dedicated key. The latter is needed to be
* able to show something when the user has rebound all * able to show something when the user has rebound all
* other sequences for a specific func. */ * other sequences for a specific func. */
if (s->type == FKEY) { if (s->type == META) {
if (!fkeysc)
fkeysc = s;
continue;
} else if (s->type == META) {
if (!metasc) if (!metasc)
metasc = s; metasc = s;
continue; continue;
} else if (s->type == FKEY) {
if (!fkeysc)
fkeysc = s;
continue;
} else if (s->type == RAWINPUT) { } else if (s->type == RAWINPUT) {
if (!rawsc) if (!rawsc)
rawsc = s; rawsc = s;
@ -344,10 +344,10 @@ const sc *first_sc_for(int menu, void (*func)(void))
/* If we did not find any control sequence, then prefer a /* If we did not find any control sequence, then prefer a
* meta sequence over a function key over a dedicated key. */ * meta sequence over a function key over a dedicated key. */
if (fkeysc && !metasc) if (metasc)
return fkeysc;
else if (metasc)
return metasc; return metasc;
else if (fkeysc)
return fkeysc;
else if (rawsc) else if (rawsc)
return rawsc; return rawsc;