nano

commit 6ab754676a6e87a586687b9c860dee477923c052
parent 9917a05f04be3acfc2aee9a1efd3aae5f3941928
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Fri, 13 Mar 2020 12:14:48 +0100

build: update the conditional placement of the "Go To Line" menu item

When either only --disable-justify or --disable-speller is used, the
"Go To Line" item should not be placed after the ^C Position item, to
keep the subsequent items (Undo, Redo, and so on) nicely paired.

(Things changed since the Linter is no longer bound to ^T by default.)

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

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/global.c b/src/global.c
@@ -804,8 +804,8 @@ void shortcut_init(void)
 		/* TRANSLATORS: Try to keep the next thirteen strings at most 12 characters. */
 		N_("Cur Pos"), WITHORSANS(cursorpos_gist), TOGETHER, VIEW);
 
-#if (defined(ENABLE_JUSTIFY) && (defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)) || \
-		!defined(ENABLE_JUSTIFY) && !defined(ENABLE_SPELLER) && !defined(ENABLE_COLOR))
+#if ((defined(ENABLE_JUSTIFY) && defined(ENABLE_SPELLER)) || \
+		(!defined(ENABLE_JUSTIFY) && !defined(ENABLE_SPELLER)))
 	/* 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,
@@ -953,8 +953,8 @@ void shortcut_init(void)
 		N_("Next File"), WITHORSANS(nextfile_gist), BLANKAFTER, VIEW);
 #endif
 
-#if (!defined(ENABLE_JUSTIFY) && (defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)) || \
-		defined(ENABLE_JUSTIFY) && !defined(ENABLE_SPELLER) && !defined(ENABLE_COLOR))
+#if ((!defined(ENABLE_JUSTIFY) && defined(ENABLE_SPELLER)) || \
+		(defined(ENABLE_JUSTIFY) && !defined(ENABLE_SPELLER)))
 	add_to_funcs(do_gotolinecolumn_void, MMAIN,
 		N_("Go To Line"), WITHORSANS(gotoline_gist), BLANKAFTER, VIEW);
 #endif