in shortcut_init(), move the "Refresh" and "Exit" shortcuts to the

beginning of the help browser shortcut list, for consistency

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

diff --git a/ChangeLog b/ChangeLog
index 400003d73b047e55e616fd7d91c26e6b9adbc123..0726ba482977d77e6a8f2a340f1b5f0c477d0169 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@ CVS code -
   do_browser()
        - Don't treat NANO_CANCEL_KEY as NANO_EXIT_KEY anymore, for
          consistency. (DLR)
+- global.c:
+  shortcut_init()
+       - Move the "Refresh" and "Exit" shortcuts to the beginning of
+         the help browser shortcut list, for consistency. (DLR)
 - nano.c:
   print1opt_full()
        - If desc should be empty, allow it to be NULL instead of

diff --git a/src/global.c b/src/global.c
index 107ea44c869962799c1d98d63c79a1ab5b6afaa3..25c102b99d7d59d2eea00a349c0900e1a930f0b4 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -794,6 +794,14 @@ void shortcut_init(bool unjustify)
 #ifndef DISABLE_HELP
     free_shortcutage(&help_list);
 
+    sc_init_one(&help_list, NANO_REFRESH_KEY, N_("Refresh"),
+       IFHELP(nano_refresh_msg, NANO_NO_KEY), NANO_NO_KEY,
+       NANO_NO_KEY, VIEW, NULL);
+
+    sc_init_one(&help_list, NANO_EXIT_KEY, exit_msg,
+       IFHELP(nano_exit_msg, NANO_NO_KEY), NANO_EXIT_FKEY,
+       NANO_NO_KEY, VIEW, NULL);
+
     sc_init_one(&help_list, NANO_PREVPAGE_KEY, prev_page_msg,
        IFHELP(nano_prevpage_msg, NANO_NO_KEY), NANO_PREVPAGE_FKEY,
        NANO_NO_KEY, VIEW, NULL);
@@ -809,14 +817,6 @@ void shortcut_init(bool unjustify)
     sc_init_one(&help_list, NANO_NEXTLINE_KEY, N_("Next Line"),
        IFHELP(nano_nextline_msg, NANO_NO_KEY), NANO_NO_KEY,
        NANO_NO_KEY, VIEW, NULL);
-
-    sc_init_one(&help_list, NANO_REFRESH_KEY, N_("Refresh"),
-       IFHELP(nano_refresh_msg, NANO_NO_KEY), NANO_NO_KEY,
-       NANO_NO_KEY, VIEW, NULL);
-
-    sc_init_one(&help_list, NANO_EXIT_KEY, exit_msg,
-       IFHELP(nano_exit_msg, NANO_NO_KEY), NANO_EXIT_FKEY,
-       NANO_NO_KEY, VIEW, NULL);
 #endif
 
     free_shortcutage(&writefile_list);