ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
Benno Schulenberg 2020-09-18 15:22:12 +02:00
parent 07b5d97a3a
commit 37f1d43ce3
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/browser.c
View File

@ -516,15 +516,11 @@ char *browse(char *path)
kbinput = KEY_WINCH; kbinput = KEY_WINCH;
#endif #endif
} else if (func == do_help) { } else if (func == do_help) {
#ifdef ENABLE_HELP
do_help(); do_help();
#ifndef NANO_TINY #ifndef NANO_TINY
/* The window dimensions might have changed, so act as if. */ /* The window dimensions might have changed, so act as if. */
kbinput = KEY_WINCH; kbinput = KEY_WINCH;
#endif #endif
#else
say_there_is_no_help();
#endif
#ifndef NANO_TINY #ifndef NANO_TINY
} else if (func == do_toggle_void) { } else if (func == do_toggle_void) {
TOGGLE(NO_HELP); TOGGLE(NO_HELP);

4
src/help.c
View File

@ -567,8 +567,8 @@ void do_help(void)
#ifdef ENABLE_HELP #ifdef ENABLE_HELP
show_help(); show_help();
#else #else
if (currmenu == MMAIN) if (currmenu == MMAIN || currmenu == MBROWSER)
say_there_is_no_help(); statusbar(_("Help is not available"));
else else
beep(); beep();
#endif #endif

8
src/nano.c
View File

@ -215,14 +215,6 @@ bool in_restricted_mode(void)
return FALSE; 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 /* Make sure the cursor is visible, then exit from curses mode, disable
* bracketed-paste mode, and restore the original terminal settings. */ * bracketed-paste mode, and restore the original terminal settings. */
void restore_terminal(void) void restore_terminal(void)

3
src/prototypes.h
View File

@ -390,9 +390,6 @@ void free_lines(linestruct *src);
void renumber_from(linestruct *line); void renumber_from(linestruct *line);
void print_view_warning(void); void print_view_warning(void);
bool in_restricted_mode(void); bool in_restricted_mode(void);
#ifndef ENABLE_HELP
void say_there_is_no_help(void);
#endif
void finish(void); void finish(void);
void close_and_go(void); void close_and_go(void);
void do_exit(void); void do_exit(void);