From 9c0f9de7c5fce465904f0674da5a59172e05695a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 22 Apr 2014 19:10:26 +0000 Subject: [PATCH] Listing function key after meta key. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4806 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/global.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34e37075..1bf5ee5d 100644 --- 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 * doc/syntax/nanorc.nanorc: There is no F0 key. diff --git a/src/global.c b/src/global.c index 5a03bfbb..f7898e86 100644 --- 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);