Listing function key after meta key.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4806 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 34e370754cb5da90ddbc33f5bbc2cf302fdb3938..1bf5ee5d0cf16cffda194d6d7c479a596292ae90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
        * src/global.c (shortcut_init): Delete unneeded empty funcs; being
        in the list of shortcuts is enough.
        * src/global.c (shortcut_init): Put left/right in normal order.
+       * src/global.c (shortcut_init): List function key after meta key.
 
 2014-04-21  Benno Schulenberg  <bensberg@justemail.net>
        * doc/syntax/nanorc.nanorc: There is no F0 key.

diff --git a/src/global.c b/src/global.c
index 5a03bfbb4a85a5b03a3b74a4d386625ce4e712f8..f7898e8626655d66ee3860f526011241d61ba8da 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1020,8 +1020,8 @@ void shortcut_init(void)
     add_to_sclist(MMAIN|MHELP|MBROWSER, "^X", do_exit, 0, TRUE);
     add_to_sclist(MMAIN|MHELP|MBROWSER, "F2", do_exit, 0, TRUE);
     add_to_sclist(MMAIN, "^_", do_gotolinecolumn_void, 0, TRUE);
-    add_to_sclist(MMAIN, "F13", do_gotolinecolumn_void, 0, TRUE);
     add_to_sclist(MMAIN, "M-G", do_gotolinecolumn_void, 0, TRUE);
+    add_to_sclist(MMAIN, "F13", do_gotolinecolumn_void, 0, TRUE);
     add_to_sclist(MMAIN, "^O", do_writeout_void, 0, TRUE);
     add_to_sclist(MMAIN, "F3", do_writeout_void, 0, TRUE);
 #ifndef DISABLE_JUSTIFY
@@ -1050,15 +1050,15 @@ void shortcut_init(void)
     add_to_sclist(MMAIN, "F12", do_spell, 0, TRUE);
 #endif
     add_to_sclist(MMAIN, "^\\", do_replace, 0, TRUE);
-    add_to_sclist(MMAIN, "F14", do_replace, 0, TRUE);
     add_to_sclist(MMAIN, "M-R", do_replace, 0, TRUE);
+    add_to_sclist(MMAIN, "F14", do_replace, 0, TRUE);
     add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE);
     add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE);
     add_to_sclist(MWHEREIS, "^T", do_gotolinecolumn_void, 0, FALSE);
 #ifndef NANO_TINY
     add_to_sclist(MMAIN, "^^", do_mark, 0, TRUE);
-    add_to_sclist(MMAIN, "F15", do_mark, 0, TRUE);
     add_to_sclist(MMAIN, "M-A", do_mark, 0, TRUE);
+    add_to_sclist(MMAIN, "F15", do_mark, 0, TRUE);
     add_to_sclist(MMAIN|MBROWSER, "M-W", do_research, 0, TRUE);
     add_to_sclist(MMAIN|MBROWSER, "F16", do_research, 0, TRUE);
     add_to_sclist(MMAIN, "M-^", do_copy_text, 0, TRUE);
@@ -1126,8 +1126,8 @@ void shortcut_init(void)
     add_to_sclist(MBROWSER|MWHEREISFILE, "M-/", do_last_file, 0, TRUE);
     add_to_sclist(MBROWSER|MWHEREISFILE, "M-?", do_last_file, 0, TRUE);
     add_to_sclist(MBROWSER|MWHEREISFILE, "^_", goto_dir_void, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "F13", goto_dir_void, 0, TRUE);
     add_to_sclist(MBROWSER|MWHEREISFILE, "M-G", goto_dir_void, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "F13", goto_dir_void, 0, TRUE);
 #endif
 #ifndef NANO_TINY
     add_to_sclist(MMAIN, "M-]", do_find_bracket, 0, TRUE);