nano

commit 80ff5e76d6fcfe55eb332e4c57bb2a1b21e5fc2c
parent 1a2d0c17705d6b7fc347bc27b10fdc08a4518c48
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Fri,  3 Jul 2020 10:51:31 +0200

help: pair the items in the two bottom lines better in the tiny version

This fixes https://savannah.gnu.org/bugs/?58693.

Bug existed since commit 9b8930cc from ten days ago.

Diffstat:
M
src/global.c
 | 
25
++++++++++---------------

1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/global.c b/src/global.c
@@ -795,7 +795,7 @@ void shortcut_init(void)
 	add_to_funcs(do_cursorpos_void, MMAIN,
 		N_("Location"), WITHORSANS(cursorpos_gist), TOGETHER, VIEW);
 
-#ifdef ENABLE_JUSTIFY
+#if defined(NANO_TINY) || defined(ENABLE_JUSTIFY)
 	/* 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,
@@ -859,23 +859,16 @@ void shortcut_init(void)
 	add_to_funcs(do_search_backward, MMAIN|MHELP,
 		/* TRANSLATORS: This starts a backward search. */
 		N_("Where Was"), WITHORSANS(wherewas_gist), TOGETHER, VIEW);
+#else
+	add_to_funcs(do_search_backward, MHELP,
+		N_("Where Was"), WITHORSANS(wherewas_gist), TOGETHER, VIEW);
 #endif
+
 	add_to_funcs(do_findprevious, MMAIN|MBROWSER|MHELP,
 		/* TRANSLATORS: This refers to searching the preceding occurrence. */
 		N_("Previous"), WITHORSANS(findprev_gist), TOGETHER, VIEW);
-#ifndef NANO_TINY
 	add_to_funcs(do_findnext, MMAIN|MBROWSER|MHELP,
 		N_("Next"), WITHORSANS(findnext_gist), BLANKAFTER, VIEW);
-#else
-	/* In the tiny version, arrange things a bit differently, so that
-	 * the useful M-W and M-Q are shown in the help lines. */
-	add_to_funcs(do_findnext, MMAIN|MBROWSER|MHELP,
-		N_("Next"), WITHORSANS(findnext_gist), TOGETHER, VIEW);
-	add_to_funcs(do_search_backward, MMAIN|MHELP,
-		N_("Where Was"), WITHORSANS(wherewas_gist), BLANKAFTER, VIEW);
-	add_to_funcs(full_refresh, MMAIN,
-		N_("Refresh"), WITHORSANS(refresh_gist), BLANKAFTER, VIEW);
-#endif
 
 	add_to_funcs(do_left, MMAIN,
 		/* TRANSLATORS: This means move the cursor one character back. */
@@ -941,7 +934,7 @@ void shortcut_init(void)
 		N_("Next File"), WITHORSANS(nextfile_gist), BLANKAFTER, VIEW);
 #endif
 
-#ifndef ENABLE_JUSTIFY
+#if !defined(NANO_TINY) && !defined(ENABLE_JUSTIFY)
 	add_to_funcs(do_gotolinecolumn_void, MMAIN,
 		N_("Go To Line"), WITHORSANS(gotoline_gist), BLANKAFTER, VIEW);
 #endif
@@ -986,10 +979,8 @@ void shortcut_init(void)
 	add_to_funcs(do_verbatim_input, MMAIN,
 		N_("Verbatim"), WITHORSANS(verbatim_gist), BLANKAFTER, NOVIEW);
 
-#ifndef NANO_TINY
 	add_to_funcs(full_refresh, MMAIN,
 		N_("Refresh"), WITHORSANS(refresh_gist), TOGETHER, VIEW);
-#endif
 
 	add_to_funcs(do_suspend_void, MMAIN,
 		N_("Suspend"), WITHORSANS(suspend_gist), BLANKAFTER, VIEW);
@@ -1037,6 +1028,10 @@ void shortcut_init(void)
 #endif
 	}
 #endif /* !NANO_TINY */
+#ifdef NANO_TINY
+	add_to_funcs(do_search_backward, MMAIN,
+		N_("Where Was"), WITHORSANS(wherewas_gist), BLANKAFTER, VIEW);
+#endif
 #if !defined(NANO_TINY) || defined(ENABLE_HELP)
 	add_to_funcs(do_center, MMAIN,
 		N_("Center"), WITHORSANS(center_gist), BLANKAFTER, VIEW);