From 13edbedc79fe341f0402884b9058ea65b92c5149 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 1 Nov 2021 18:11:20 +0100 Subject: [PATCH] tweaks: replace a verbose condition with a simpler early return --- src/nano.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/nano.c b/src/nano.c index caa48e8f..37acacbd 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1084,19 +1084,20 @@ void do_toggle(int flag) #endif } - if (!ISSET(MINIBAR) && ISSET(STATEFLAGS)) - if (flag == AUTOINDENT || flag == BREAK_LONG_LINES || flag == SOFTWRAP) + if (ISSET(STATEFLAGS) && (flag == AUTOINDENT || + flag == BREAK_LONG_LINES || flag == SOFTWRAP)) { + if (ISSET(MINIBAR)) + return; + else titlebar(NULL); + } if (ISSET(MINIBAR) && (flag == NO_HELP || flag == LINE_NUMBERS)) return; if (flag == CONSTANT_SHOW) wipe_statusbar(); - 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) { + else { bool enabled = ISSET(flag); if (flag == NO_HELP || flag == NO_SYNTAX)