From b77b54bf73503b0add4fa37d7b593a3cafbb63da Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sat, 24 Feb 2018 17:51:27 +0100
Subject: [PATCH] tweaks: elide two unneeded booleans

---
 src/nano.c   | 13 ++++---------
 src/prompt.c | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/nano.c b/src/nano.c
index 8e6f98de..6e69a0f9 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1631,7 +1631,6 @@ int do_input(bool allow_funcs)
 	bool retain_cuts = FALSE;
 		/* Whether to conserve the current contents of the cutbuffer. */
 	const sc *s;
-	bool have_shortcut;
 
 	/* Read in a keystroke, and show the cursor while waiting. */
 	input = get_kbinput(edit, VISIBLE);
@@ -1657,13 +1656,9 @@ int do_input(bool allow_funcs)
 	/* Check for a shortcut in the main list. */
 	s = get_shortcut(&input);
 
-	/* If we got a shortcut from the main list, or a "universal"
-	 * edit window shortcut, set have_shortcut to TRUE. */
-	have_shortcut = (s != NULL);
-
 	/* If we got a non-high-bit control key, a meta key sequence, or a
 	 * function key, and it's not a shortcut or toggle, throw it out. */
-	if (!have_shortcut) {
+	if (s == NULL) {
 		if (is_ascii_cntrl_char(input) || meta_key || !is_byte(input)) {
 			unbound_key(input);
 			input = ERR;
@@ -1676,7 +1671,7 @@ int do_input(bool allow_funcs)
 	/* If the keystroke isn't a shortcut nor a toggle, it's a normal text
 	 * character: add the character to the input buffer -- or display a
 	 * warning when we're in view mode. */
-	if (input != ERR && !have_shortcut) {
+	if (input != ERR && s == NULL) {
 		if (ISSET(VIEW_MODE))
 			print_view_warning();
 		else {
@@ -1696,7 +1691,7 @@ int do_input(bool allow_funcs)
 	 * characters waiting after the one we read in, we need to output
 	 * all available characters in the input puddle.  Note that this
 	 * puddle will be empty if we're in view mode. */
-	if (have_shortcut || get_key_buffer_len() == 0) {
+	if (s || get_key_buffer_len() == 0) {
 		if (puddle != NULL) {
 			/* Insert all bytes in the input buffer into the edit buffer
 			 * at once, filtering out any low control codes. */
@@ -1710,7 +1705,7 @@ int do_input(bool allow_funcs)
 		}
 	}
 
-	if (!have_shortcut)
+	if (s == NULL)
 		pletion_line = NULL;
 	else {
 		const subnfunc *f = sctofunc(s);
diff --git a/src/prompt.c b/src/prompt.c
index 280fb6fa..3a65d0ce 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -65,7 +65,6 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 	static size_t kbinput_len = 0;
 		/* The length of the input buffer. */
 	const sc *s;
-	bool have_shortcut = FALSE;
 	const subnfunc *f;
 
 	*ran_func = FALSE;
@@ -93,13 +92,9 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 	/* Check for a shortcut in the current list. */
 	s = get_shortcut(&input);
 
-	/* If we got a shortcut from the current list, or a "universal"
-	 * statusbar prompt shortcut, set have_shortcut to TRUE. */
-	have_shortcut = (s != NULL);
-
 	/* If we got a non-high-bit control key, a meta key sequence, or a
 	 * function key, and it's not a shortcut or toggle, throw it out. */
-	if (!have_shortcut) {
+	if (s == NULL) {
 		if (is_ascii_cntrl_char(input) || meta_key || !is_byte(input)) {
 			beep();
 			input = ERR;
@@ -108,7 +103,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 
 	/* If the keystroke isn't a shortcut nor a toggle, it's a normal text
 	 * character: add the it to the input buffer, when allowed. */
-	if (input != ERR && !have_shortcut) {
+	if (input != ERR && s == NULL) {
 		/* Only accept input when not in restricted mode, or when not at
 		 * the "Write File" prompt, or when there is no filename yet. */
 		if (!ISSET(RESTRICTED) || currmenu != MWRITEFILE ||
@@ -122,7 +117,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 	/* If we got a shortcut, or if there aren't any other keystrokes waiting
 	 * after the one we read in, we need to insert all the characters in the
 	 * input buffer (if not empty) into the answer. */
-	if ((have_shortcut || get_key_buffer_len() == 0) && kbinput != NULL) {
+	if ((s || get_key_buffer_len() == 0) && kbinput != NULL) {
 		/* Inject all characters in the input buffer at once, filtering out
 		 * control characters. */
 		do_statusbar_output(kbinput, kbinput_len, TRUE);
@@ -133,7 +128,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
 		kbinput = NULL;
 	}
 
-	if (have_shortcut) {
+	if (s) {
 		if (s->scfunc == do_tab || s->scfunc == do_enter)
 			;
 		else if (s->scfunc == do_left)