nano

commit 37f1d43ce367c78711745f49aa39b2c5042ba8f9
parent 07b5d97a3a83f25c6ce6a421732d3492c6950f48
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Fri, 18 Sep 2020 15:22:12 +0200

tweaks: elide a one-line function, after reducing it to a single call

Diffstat:
M
src/browser.c
 | 
4
----
M
src/help.c
 | 
4
++--
M
src/nano.c
 | 
8
--------
M
src/prototypes.h
 | 
3
---

4 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/browser.c b/src/browser.c
@@ -516,15 +516,11 @@ char *browse(char *path)
 			kbinput = KEY_WINCH;
 #endif
 		} else if (func == do_help) {
-#ifdef ENABLE_HELP
 			do_help();
 #ifndef NANO_TINY
 			/* The window dimensions might have changed, so act as if. */
 			kbinput = KEY_WINCH;
 #endif
-#else
-			say_there_is_no_help();
-#endif
 #ifndef NANO_TINY
 		} else if (func == do_toggle_void) {
 			TOGGLE(NO_HELP);
diff --git a/src/help.c b/src/help.c
@@ -567,8 +567,8 @@ void do_help(void)
 #ifdef ENABLE_HELP
 	show_help();
 #else
-	if (currmenu == MMAIN)
-		say_there_is_no_help();
+	if (currmenu == MMAIN || currmenu == MBROWSER)
+		statusbar(_("Help is not available"));
 	else
 		beep();
 #endif
diff --git a/src/nano.c b/src/nano.c
@@ -215,14 +215,6 @@ bool in_restricted_mode(void)
 		return FALSE;
 }
 
-#ifndef ENABLE_HELP
-/* Indicate that help texts are unavailable. */
-void say_there_is_no_help(void)
-{
-	statusbar(_("Help is not available"));
-}
-#endif
-
 /* Make sure the cursor is visible, then exit from curses mode, disable
  * bracketed-paste mode, and restore the original terminal settings. */
 void restore_terminal(void)
diff --git a/src/prototypes.h b/src/prototypes.h
@@ -390,9 +390,6 @@ void free_lines(linestruct *src);
 void renumber_from(linestruct *line);
 void print_view_warning(void);
 bool in_restricted_mode(void);
-#ifndef ENABLE_HELP
-void say_there_is_no_help(void);
-#endif
 void finish(void);
 void close_and_go(void);
 void do_exit(void);