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

tweaks: condense the conditional compilation of shortcut reassignments 

These three functions are needed only when both linter and speller
are available.
master
Benno Schulenberg 2018-01-09 12:38:12 +01:00
parent 7947d9d2a5
commit 0bb6c0234f
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/global.c
View File

@ -379,16 +379,6 @@ void add_to_sclist(int menus, const char *scstring, const int keycode,
#endif #endif
} }
/* Assign one function's shortcuts to another function. */
void replace_scs_for(void (*oldfunc)(void), void (*newfunc)(void))
{
sc *s;
for (s = sclist; s != NULL; s = s->next)
if (s->scfunc == oldfunc)
s->scfunc = newfunc;
}
/* Return the first shortcut in the list of shortcuts that /* Return the first shortcut in the list of shortcuts that
* matches the given func in the given menu. */ * matches the given func in the given menu. */
const sc *first_sc_for(int menu, void (*func)(void)) const sc *first_sc_for(int menu, void (*func)(void))
@ -1363,10 +1353,17 @@ void shortcut_init(void)
#endif #endif
} }
#ifdef ENABLE_COLOR #if defined(ENABLE_COLOR) && defined(ENABLE_SPELLER)
/* Assign one function's shortcuts to another function. */
void replace_scs_for(void (*oldfunc)(void), void (*newfunc)(void))
{
for (sc *s = sclist; s != NULL; s = s->next)
if (s->scfunc == oldfunc)
s->scfunc = newfunc;
}
void set_lint_or_format_shortcuts(void) void set_lint_or_format_shortcuts(void)
{ {
#ifdef ENABLE_SPELLER
if (openfile->syntax->formatter) { if (openfile->syntax->formatter) {
replace_scs_for(do_spell, do_formatter); replace_scs_for(do_spell, do_formatter);
replace_scs_for(do_linter, do_formatter); replace_scs_for(do_linter, do_formatter);
@ -1374,17 +1371,14 @@ void set_lint_or_format_shortcuts(void)
replace_scs_for(do_spell, do_linter); replace_scs_for(do_spell, do_linter);
replace_scs_for(do_formatter, do_linter); replace_scs_for(do_formatter, do_linter);
} }
#endif
} }
void set_spell_shortcuts(void) void set_spell_shortcuts(void)
{ {
#ifdef ENABLE_SPELLER
replace_scs_for(do_formatter, do_spell); replace_scs_for(do_formatter, do_spell);
replace_scs_for(do_linter, do_spell); replace_scs_for(do_linter, do_spell);
#endif
} }
#endif /* ENABLE_COLOR */ #endif /* ENABLE_COLOR && ENABLE_SPELLER */
const subnfunc *sctofunc(const sc *s) const subnfunc *sctofunc(const sc *s)
{ {

2
src/winio.c
View File

@ -3339,7 +3339,7 @@ void total_refresh(void)
* portion of the window. */ * portion of the window. */
void display_main_list(void) void display_main_list(void)
{ {
#ifdef ENABLE_COLOR #if defined(ENABLE_COLOR) && defined(ENABLE_SPELLER)
if (openfile->syntax && if (openfile->syntax &&
(openfile->syntax->formatter || openfile->syntax->linter)) (openfile->syntax->formatter || openfile->syntax->linter))
set_lint_or_format_shortcuts(); set_lint_or_format_shortcuts();