nano

commit c2746c0bb22d92475707da0a33794a3c0fa8e906
parent 399a024857a0d72a11dcfa747d6387d90698b97b
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Mon,  8 Feb 2021 12:32:39 +0100

tweaks: reshuffle some code, and reduce the scope of a variable

Diffstat:
M
src/nano.c
 | 
32
++++++++++++++++----------------

1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/nano.c b/src/nano.c
@@ -1065,8 +1065,6 @@ void regenerate_screen(void)
 /* Handle the global toggle specified in flag. */
 void do_toggle(int flag)
 {
-	bool enabled;
-
 	if (flag == SUSPENDABLE && in_restricted_mode())
 		return;
 
@@ -1102,25 +1100,27 @@ void do_toggle(int flag)
 #endif
 	}
 
-	if (ISSET(STATEFLAGS) && (flag == AUTOINDENT ||
-						flag == BREAK_LONG_LINES || flag == SOFTWRAP))
-		titlebar(NULL);
-
-	enabled = ISSET(flag);
+	if (!ISSET(MINIBAR) && ISSET(STATEFLAGS))
+		if (flag == AUTOINDENT || flag == BREAK_LONG_LINES || flag == SOFTWRAP)
+			titlebar(NULL);
 
-	if (flag == NO_HELP || flag == NO_SYNTAX)
-		enabled = !enabled;
+	if (ISSET(MINIBAR) && (flag == NO_HELP || flag == LINE_NUMBERS ))
+		return;
 
 	if (flag == CONSTANT_SHOW)
 		wipe_statusbar();
-	else if (ISSET(MINIBAR) && (flag == NO_HELP || flag == LINE_NUMBERS ))
-		;
-	else
-	if (!ISSET(MINIBAR) || !ISSET(STATEFLAGS) || flag == SMART_HOME || flag == CUT_FROM_CURSOR ||
-				flag == NO_SYNTAX || flag == WHITESPACE_DISPLAY ||
-				flag == TABS_TO_SPACES || flag == USE_MOUSE || flag == SUSPENDABLE)
+	else if (!ISSET(MINIBAR) || !ISSET(STATEFLAGS) || flag == SMART_HOME ||
+						flag == NO_SYNTAX || flag == WHITESPACE_DISPLAY ||
+						flag == CUT_FROM_CURSOR || flag == TABS_TO_SPACES ||
+						flag == USE_MOUSE || flag == SUSPENDABLE) {
+		bool enabled = ISSET(flag);
+
+		if (flag == NO_HELP || flag == NO_SYNTAX)
+			enabled = !enabled;
+
 		statusline(REMARK, "%s %s", _(flagtostr(flag)),
-						enabled ? _("enabled") : _("disabled"));
+									enabled ? _("enabled") : _("disabled"));
+	}
 }
 #endif /* !NANO_TINY */