nano

commit b27b3a18a9bae0f70da4595979b01f96de824859
parent 96466166f1c01596a4485ebb55cc07a054101a0f
Author: Chris Allegretta <chrisa@asty.org>
Date:   Fri,  4 Dec 2009 04:29:55 +0000

2009-12-03 David Lawrence Ramsey <pooka109@gmail.com>
        * global.c (shortcut_init) - Remove help shortcut from help shortcut list :-)  Tweaked
          to reorder exit shortcut to end of list to not mess up prev/next shortcut symmetry.



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

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/global.c
 | 
17
+++++++++++------

2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-03 David Lawrence Ramsey <pooka109@gmail.com>
+	* global.c (shortcut_init) - Remove help shortcut from help shortcut list :-)  Tweaked 
+	  to reorder exit shortcut to end of list to not mess up prev/next shortcut symmetry.
+
 2009-12-03 Eitan Adler <eitanadlerlist@gmail.com>
 	* doc/syntax/makefile.nanorc - Fix poor regex for all alpha characters which sometimes leads to
 	  error messages, reported by gibboris@gmail.com.
diff --git a/src/global.c b/src/global.c
@@ -655,8 +655,9 @@ void shortcut_init(bool unjustify)
         free(f);
     }
 
-    add_to_funcs(DO_HELP_VOID, MALL, get_help_msg, IFSCHELP(nano_help_msg),
-	FALSE, VIEW);
+    add_to_funcs(DO_HELP_VOID,
+	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR),
+	get_help_msg, IFSCHELP(nano_help_msg), FALSE, VIEW);
 
     add_to_funcs( CANCEL_MSG,
 	(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
@@ -669,8 +670,6 @@ void shortcut_init(bool unjustify)
 #endif
 	exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
 
-    add_to_funcs(DO_EXIT, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
-
 #ifndef DISABLE_BROWSER
     add_to_funcs(DO_EXIT, MBROWSER, exit_msg, IFSCHELP(nano_exitbrowser_msg), FALSE, VIEW);
 #endif
@@ -1001,6 +1000,10 @@ void shortcut_init(bool unjustify)
 #ifndef DISABLE_HELP
     add_to_funcs( REFRESH_MSG, MHELP,
 	refresh_msg, nano_refresh_msg, FALSE, VIEW);
+
+    add_to_funcs(DO_EXIT, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
+
+
 #endif
 
 #ifndef DISABLE_BROWSER
@@ -1019,8 +1022,10 @@ void shortcut_init(bool unjustify)
 
     currmenu = MMAIN;
 
-    add_to_sclist(MALL, "^G", DO_HELP_VOID, 0, TRUE);
-    add_to_sclist(MALL, "F1", DO_HELP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR,
+	"^G", DO_HELP_VOID, 0, TRUE);
+    add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR,
+	"F1", DO_HELP_VOID, 0, TRUE);
     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);