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

tweaks: rename two functions, to get rid of the senseless suffix of one

master
Benno Schulenberg 2021-11-08 16:16:35 +01:00
parent 308d6e73e3
commit ea4bbf4285
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser.c
View File

@ -534,7 +534,7 @@ char *browse(char *path)
kbinput = KEY_WINCH;
#endif
#ifndef NANO_TINY
} else if (func == do_toggle_void) {
} else if (func == do_toggle) {
TOGGLE(NO_HELP);
window_init();
kbinput = KEY_WINCH;

30
src/global.c
View File

@ -298,7 +298,7 @@ void goto_dir(void) {;}
#endif
#ifndef NANO_TINY
void do_nothing(void) {;}
void do_toggle_void(void) {;}
void do_toggle(void) {;}
void dos_format(void) {;}
void mac_format(void) {;}
void append_it(void) {;}
@ -1355,29 +1355,29 @@ void shortcut_init(void)
#ifndef NANO_TINY
/* Group of "Appearance" toggles. */
add_to_sclist((MMOST|MBROWSER|MYESNO) & ~MFINDINHELP, "M-X", 0, do_toggle_void, NO_HELP);
add_to_sclist(MMAIN, "M-C", 0, do_toggle_void, CONSTANT_SHOW);
add_to_sclist(MMAIN, "M-S", 0, do_toggle_void, SOFTWRAP);
add_to_sclist(MMAIN, "M-$", 0, do_toggle_void, SOFTWRAP); /* Legacy keystroke. */
add_to_sclist((MMOST|MBROWSER|MYESNO) & ~MFINDINHELP, "M-X", 0, do_toggle, NO_HELP);
add_to_sclist(MMAIN, "M-C", 0, do_toggle, CONSTANT_SHOW);
add_to_sclist(MMAIN, "M-S", 0, do_toggle, SOFTWRAP);
add_to_sclist(MMAIN, "M-$", 0, do_toggle, SOFTWRAP); /* Legacy keystroke. */
#ifdef ENABLE_LINENUMBERS
add_to_sclist(MMAIN, "M-N", 0, do_toggle_void, LINE_NUMBERS);
add_to_sclist(MMAIN, "M-#", 0, do_toggle_void, LINE_NUMBERS); /* Legacy keystroke. */
add_to_sclist(MMAIN, "M-N", 0, do_toggle, LINE_NUMBERS);
add_to_sclist(MMAIN, "M-#", 0, do_toggle, LINE_NUMBERS); /* Legacy keystroke. */
#endif
add_to_sclist(MMAIN, "M-P", 0, do_toggle_void, WHITESPACE_DISPLAY);
add_to_sclist(MMAIN, "M-P", 0, do_toggle, WHITESPACE_DISPLAY);
#ifdef ENABLE_COLOR
add_to_sclist(MMAIN, "M-Y", 0, do_toggle_void, NO_SYNTAX);
add_to_sclist(MMAIN, "M-Y", 0, do_toggle, NO_SYNTAX);
#endif
/* Group of "Behavior" toggles. */
add_to_sclist(MMAIN, "M-H", 0, do_toggle_void, SMART_HOME);
add_to_sclist(MMAIN, "M-I", 0, do_toggle_void, AUTOINDENT);
add_to_sclist(MMAIN, "M-K", 0, do_toggle_void, CUT_FROM_CURSOR);
add_to_sclist(MMAIN, "M-H", 0, do_toggle, SMART_HOME);
add_to_sclist(MMAIN, "M-I", 0, do_toggle, AUTOINDENT);
add_to_sclist(MMAIN, "M-K", 0, do_toggle, CUT_FROM_CURSOR);
#ifdef ENABLE_WRAPPING
add_to_sclist(MMAIN, "M-L", 0, do_toggle_void, BREAK_LONG_LINES);
add_to_sclist(MMAIN, "M-L", 0, do_toggle, BREAK_LONG_LINES);
#endif
add_to_sclist(MMAIN, "M-O", 0, do_toggle_void, TABS_TO_SPACES);
add_to_sclist(MMAIN, "M-O", 0, do_toggle, TABS_TO_SPACES);
#ifdef ENABLE_MOUSE
add_to_sclist(MMAIN, "M-M", 0, do_toggle_void, USE_MOUSE);
add_to_sclist(MMAIN, "M-M", 0, do_toggle, USE_MOUSE);
#endif
#endif /* !NANO_TINY */

2
src/help.c
View File

@ -234,7 +234,7 @@ void help_init(void)
size_t onoff_len = strlen(_("enable/disable"));
for (s = sclist; s != NULL; s = s->next)
if (s->func == do_toggle_void)
if (s->func == do_toggle)
allocsize += strlen(_(flagtostr(s->toggle))) + onoff_len + 9;
}
#endif

8
src/nano.c
View File

@ -1063,8 +1063,8 @@ void regenerate_screen(void)
}
}
/* Handle the global toggle specified in flag. */
void do_toggle(int flag)
/* Invert the given global flag and adjust things for its new value. */
void toggle_this(int flag)
{
TOGGLE(flag);
focusing = FALSE;
@ -1603,8 +1603,8 @@ void process_a_keystroke(void)
}
#endif
#ifndef NANO_TINY
if (shortcut->func == do_toggle_void) {
do_toggle(shortcut->toggle);
if (shortcut->func == do_toggle) {
toggle_this(shortcut->toggle);
if (shortcut->toggle == CUT_FROM_CURSOR)
keep_cutbuffer = FALSE;
return;

4
src/prompt.c
View File

@ -537,7 +537,7 @@ functionptrtype acquire_an_answer(int *actual, bool *listed,
#ifndef NANO_TINY
else if (func == do_nothing)
finished = FALSE;
else if (func == do_toggle_void) {
else if (func == do_toggle) {
TOGGLE(NO_HELP);
window_init();
focusing = FALSE;
@ -765,7 +765,7 @@ int do_yesno_prompt(bool all, const char *msg)
else if (func_from_key(&kbinput) == full_refresh)
full_refresh();
#ifndef NANO_TINY
else if (func_from_key(&kbinput) == do_toggle_void) {
else if (func_from_key(&kbinput) == do_toggle) {
TOGGLE(NO_HELP);
window_init();
titlebar(NULL);

2
src/prototypes.h
View File

@ -644,7 +644,7 @@ void goto_dir(void);
#endif
#ifndef NANO_TINY
void do_nothing(void);
void do_toggle_void(void);
void do_toggle(void);
void dos_format(void);
void mac_format(void);
void append_it(void);

10
src/rcfile.c
View File

@ -448,7 +448,7 @@ keystruct *strtosc(const char *input)
#endif
else {
#ifndef NANO_TINY
s->func = do_toggle_void;
s->func = do_toggle;
if (!strcmp(input, "nohelp"))
s->toggle = NO_HELP;
else if (!strcmp(input, "constantshow"))
@ -823,9 +823,9 @@ void parse_binding(char *ptr, bool dobind)
if (is_universal(newsc->func))
menu &= MMOST|MBROWSER;
#ifndef NANO_TINY
else if (newsc->func == do_toggle_void && newsc->toggle == NO_HELP)
else if (newsc->func == do_toggle && newsc->toggle == NO_HELP)
menu &= (MMOST|MBROWSER|MYESNO) & ~MFINDINHELP;
else if (newsc->func == do_toggle_void)
else if (newsc->func == do_toggle)
menu &= MMAIN;
#endif
else if (newsc->func == full_refresh)
@ -863,9 +863,9 @@ void parse_binding(char *ptr, bool dobind)
#ifndef NANO_TINY
/* If this is a toggle, find and copy its sequence number. */
if (newsc->func == do_toggle_void) {
if (newsc->func == do_toggle) {
for (keystruct *s = sclist; s != NULL; s = s->next)
if (s->func == do_toggle_void && s->toggle == newsc->toggle)
if (s->func == do_toggle && s->toggle == newsc->toggle)
newsc->ordinal = s->ordinal;
} else
newsc->ordinal = 0;