Arranging the movement keys in the File Browser in the order of

ascending stride, as in the Help Viewer.

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

diff --git a/ChangeLog b/ChangeLog
index ba2c25e080085ef963ddf8b8260d28595ea3a3df..f76b2ce3a10cd969fe6d3f4d2a151ea4d2f01e99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
        mimic the behaviour of these keys in file viewers and web browsers.
        Also show ^Y and ^V in the WhereisFile menu instead of M-\ and M-/,
        for similarity with the WhereIs menu.
+       * src/global.c (shortcut_init): Arrange the movement keys in the File
+       Browser in the order of ascending stride, as in the Help Viewer.
 
 GNU nano 2.4.1 - 2015.04.14
 2015-04-13  Benno Schulenberg  <bensberg@justemail.net>

diff --git a/src/global.c b/src/global.c
index 76b22d68a3cc3f7cfd612432ec3bec4e1f345cbb..5cacb71b00ca805098c350cc92df4ddb20384b56 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -490,12 +490,14 @@ const char *whereis_next_tag = N_("WhereIs Next");
 /* Initialize the list of functions and the list of shortcuts. */
 void shortcut_init(void)
 {
-    /* TRANSLATORS: Try to keep the next eight strings at most 10 characters. */
+    /* TRANSLATORS: Try to keep the next ten strings at most 10 characters. */
     const char *whereis_tag = N_("Where Is");
     const char *replace_tag = N_("Replace");
     const char *gotoline_tag = N_("Go To Line");
     const char *prev_line_tag = N_("Prev Line");
     const char *next_line_tag = N_("Next Line");
+    const char *prev_page_tag = N_("Prev Page");
+    const char *next_page_tag = N_("Next Page");
     const char *read_file_tag = N_("Read File");
 #ifndef DISABLE_JUSTIFY
     const char *fulljustify_tag = N_("FullJstify");
@@ -782,10 +784,10 @@ void shortcut_init(void)
        gotoline_tag, IFSCHELP(nano_gotoline_msg), BLANKAFTER, VIEW);
 #endif
 
-    add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER,
-       N_("Prev Page"), IFSCHELP(nano_prevpage_msg), TOGETHER, VIEW);
-    add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER,
-       N_("Next Page"), IFSCHELP(nano_nextpage_msg), TOGETHER, VIEW);
+    add_to_funcs(do_page_up, MMAIN|MHELP,
+       prev_page_tag, IFSCHELP(nano_prevpage_msg), TOGETHER, VIEW);
+    add_to_funcs(do_page_down, MMAIN|MHELP,
+       next_page_tag, IFSCHELP(nano_nextpage_msg), TOGETHER, VIEW);
 
     add_to_funcs(do_first_line, MMAIN|MHELP|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE,
        N_("First Line"), IFSCHELP(nano_firstline_msg), TOGETHER, VIEW);
@@ -966,10 +968,15 @@ void shortcut_init(void)
        add_to_funcs(to_files_void, MWRITEFILE|MINSERTFILE,
            N_("To Files"), IFSCHELP(nano_tofiles_msg), TOGETHER, VIEW);
 
+    add_to_funcs(do_page_up, MBROWSER,
+       prev_page_tag, IFSCHELP(nano_prevpage_msg), TOGETHER, VIEW);
+    add_to_funcs(do_page_down, MBROWSER,
+       next_page_tag, IFSCHELP(nano_nextpage_msg), TOGETHER, VIEW);
+
     add_to_funcs(do_first_file, (MBROWSER|MWHEREISFILE),
        N_("First File"), IFSCHELP(nano_firstfile_msg), TOGETHER, VIEW);
     add_to_funcs(do_last_file, (MBROWSER|MWHEREISFILE),
-       N_("Last File"), IFSCHELP(nano_lastfile_msg), TOGETHER, VIEW);
+       N_("Last File"), IFSCHELP(nano_lastfile_msg), BLANKAFTER, VIEW);
 #endif
 
 #if !defined(NANO_TINY) && !defined(DISABLE_BROWSER)