nano

commit 12da94c9b2fb6576bea6718f322d10cf641b9331
parent e15abc9c1e72fedc91347a3f14aaa658acc457d6
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Tue, 22 Apr 2014 10:02:55 +0000

Putting the movement keys in the help viewer in the order of increasing stride.


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

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

2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Put the movement keys in the
+	help viewer in the order of increasing stride.
+
 2014-04-21  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/syntax/nanorc.nanorc: There is no F0 key.
 	* src/global.c (first_sc_for): Adjust two comments -- the help
diff --git a/src/global.c b/src/global.c
@@ -545,6 +545,8 @@ void shortcut_init(void)
     const char *get_help_msg = N_("Get Help");
     const char *exit_msg = N_("Exit");
     const char *whereis_msg = N_("Where Is");
+    const char *prev_line_tag = N_("Prev Line");
+    const char *next_line_tag = N_("Next Line");
     const char *prev_page_msg = N_("Prev Page");
     const char *next_page_msg = N_("Next Page");
     const char *first_line_msg = N_("First Line");
@@ -788,9 +790,14 @@ void shortcut_init(void)
 #endif
 
 #ifndef DISABLE_HELP
-    add_to_funcs(do_exit, MHELP, exit_msg, nano_exit_msg, FALSE, VIEW);
+    /* The description ("x") and blank_after (0) are irrelevant,
+     * because the help viewer does not have a help text. */
+    add_to_funcs(do_exit, MHELP, exit_msg, "x", 0, VIEW);
 
-    add_to_funcs(total_refresh, MHELP, refresh_msg, nano_refresh_msg, FALSE, VIEW);
+    add_to_funcs(total_refresh, MHELP, refresh_msg, "x", 0, VIEW);
+
+    add_to_funcs(do_up_void, MHELP, prev_line_tag, "x", 0, VIEW);
+    add_to_funcs(do_down_void, MHELP, next_line_tag, "x" , 0, VIEW);
 #endif
 
     add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER,
@@ -905,9 +912,9 @@ void shortcut_init(void)
 	IFSCHELP(nano_nextword_msg), FALSE, VIEW);
 #endif
 
-    add_to_funcs(do_up_void, (MMAIN|MHELP|MBROWSER), N_("Prev Line"),
+    add_to_funcs(do_up_void, (MMAIN|MBROWSER), prev_line_tag,
 	IFSCHELP(nano_prevline_msg), FALSE, VIEW);
-    add_to_funcs(do_down_void, (MMAIN|MHELP|MBROWSER), N_("Next Line"),
+    add_to_funcs(do_down_void, (MMAIN|MBROWSER), next_line_tag,
 	IFSCHELP(nano_nextline_msg), TRUE, VIEW);
 
     add_to_funcs(do_home, MMAIN, N_("Home"), IFSCHELP(nano_home_msg),