Improving the arrangement of help items under certain compilation conditions.

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

diff --git a/ChangeLog b/ChangeLog
index 518e458d76d6c8d1c9c5297e3b4982a3cb624248..4a2f402a6654e663c4bdb9d373747bf60ccae0ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-27  Benno Schulenberg  <bensberg@justemail.net>
+       * src/global.c (shortcut_init): Improve the arrangement of help items
+       under certain compilation conditions.
+
 2014-05-26  Benno Schulenberg  <bensberg@justemail.net>
        * src/cut.c (cut_line): Fix compilation with --enable-tiny.
        * src/text.c (do_linter): Avoid a warning with --enable-tiny.

diff --git a/src/global.c b/src/global.c
index b8afb57d17d0b9008fa08988944f0556b6cd52d5..ddeb06d6a7ffc835dff3f8eab4382c525e039364 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -767,8 +767,12 @@ void shortcut_init(void)
     add_to_funcs(do_cursorpos_void, MMAIN, N_("Cur Pos"),
        IFSCHELP(nano_cursorpos_msg), FALSE, VIEW);
 
+#if !defined(NANO_TINY) || defined(DISABLE_COLOR)
+    /* Conditionally placing this one here or further on, to keep the
+     * help items nicely paired in most conditions. */
     add_to_funcs(do_gotolinecolumn_void, MMAIN|MWHEREIS,
        gotoline_tag, IFSCHELP(nano_gotoline_msg), TRUE, VIEW);
+#endif
 
     add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER,
        N_("Prev Page"), IFSCHELP(nano_prevpage_msg), FALSE, VIEW);
@@ -858,6 +862,11 @@ void shortcut_init(void)
        IFSCHELP(nano_nextfile_msg), TRUE, VIEW);
 #endif
 
+#if defined(NANO_TINY) && !defined(DISABLE_COLOR)
+    add_to_funcs(do_gotolinecolumn_void, MMAIN|MWHEREIS,
+       gotoline_tag, IFSCHELP(nano_gotoline_msg), TRUE, VIEW);
+#endif
+
     add_to_funcs(do_verbatim_input, MMAIN, N_("Verbatim"),
        IFSCHELP(nano_verbatim_msg), FALSE, NOVIEW);