Grouping related commands into the same column of the help lines.

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

diff --git a/ChangeLog b/ChangeLog
index 529c56691495f6c53bd9f536a488be19fce1fa23..1c140e12acc45a73c2e4a42c5fabc9911624c043 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-26  Benno Schulenberg  <bensberg@justemail.net>
+       * src/global.c (shortcut_init) -  Put PageUp and PageDown
+       and also WhereIs and WhereIsNext together in the help lines
+       of the file browser, and WriteOut and Readfile in the help
+       lines of the main window -- related stuff in one column.
+
 2014-02-26  Konstantin Abakumov  <abakumov@Savannah>  (tiny change)
        * doc/syntax/python.nanorc - Slightly improve the regexes for
        multiline strings in Python, reducing spillage.

diff --git a/src/global.c b/src/global.c
index b47a822675c896ee8b31ff8e9844eb3ebe58f1cb..a7a46ca7ca6a7d2a2b7ce603e89915709bfff6de 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -771,12 +771,6 @@ void shortcut_init(bool unjustify)
     add_to_funcs(do_writeout_void, MMAIN, N_("WriteOut"),
        IFSCHELP(nano_writeout_msg), FALSE, NOVIEW);
 
-#ifndef DISABLE_JUSTIFY
-    /* TRANSLATORS: Try to keep this at most 10 characters. */
-    add_to_funcs(do_justify_void, MMAIN, N_("Justify"),
-       nano_justify_msg, TRUE, NOVIEW);
-#endif
-
     /* We allow inserting files in view mode if multibuffers are
      * available, so that we can view multiple files.  If we're using
      * restricted mode, inserting files is disabled, since it allows
@@ -795,6 +789,15 @@ void shortcut_init(bool unjustify)
     add_to_funcs(do_search, MMAIN|MBROWSER, whereis_msg,
        IFSCHELP(nano_whereis_msg), FALSE, VIEW);
 
+    add_to_funcs(do_research, MBROWSER, whereis_next_msg,
+       IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);
+
+#ifndef DISABLE_JUSTIFY
+    /* TRANSLATORS: Try to keep this at most 10 characters. */
+    add_to_funcs(do_justify_void, MMAIN, N_("Justify"),
+       nano_justify_msg, TRUE, NOVIEW);
+#endif
+
     add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER,
        prev_page_msg, IFSCHELP(nano_prevpage_msg), FALSE, VIEW);
     add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER,
@@ -869,7 +872,7 @@ void shortcut_init(bool unjustify)
     add_to_funcs(do_mark, MMAIN, N_("Mark Text"),
        IFSCHELP(nano_mark_msg), FALSE, VIEW);
 
-    add_to_funcs(do_research, (MMAIN|MBROWSER), whereis_next_msg,
+    add_to_funcs(do_research, MMAIN, whereis_next_msg,
        IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);
 
     add_to_funcs(do_copy_text, MMAIN, N_("Copy Text"),