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

Defining a shortcut for the linter when the speller is disabled, 

and fixing compilation with --disable-speller.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4850 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-05-09 15:14:29 +00:00
parent d16f9af022
commit 387b20969d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@
again correctly. This fixes the second part of Savannah bug #42093. again correctly. This fixes the second part of Savannah bug #42093.
* src/global.c (shortcut_init, strtosc): Do not define nor accept * src/global.c (shortcut_init, strtosc): Do not define nor accept
shortcuts for functions that are disabled. shortcuts for functions that are disabled.
* src/global.c (shortcut_init, strtosc): Define shortcut for the linter
when speller is disabled, and fix compilation with --disable-speller.
2014-05-06 Benno Schulenberg <bensberg@justemail.net> 2014-05-06 Benno Schulenberg <bensberg@justemail.net>
* doc/texinfo/nano.texi: Let makeinfo figure out the node pointers. * doc/texinfo/nano.texi: Let makeinfo figure out the node pointers.

10
src/global.c
View File

@ -742,9 +742,6 @@ void shortcut_init(void)
nano_justify_msg, FALSE, NOVIEW); nano_justify_msg, FALSE, NOVIEW);
#endif #endif
/* If we're using restricted mode, spell checking is disabled
* because it allows reading from or writing to files not specified
* on the command line. */
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
add_to_funcs(do_spell, MMAIN, spell_tag, IFSCHELP(nano_spell_msg), add_to_funcs(do_spell, MMAIN, spell_tag, IFSCHELP(nano_spell_msg),
FALSE, NOVIEW); FALSE, NOVIEW);
@ -1012,6 +1009,11 @@ void shortcut_init(void)
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
add_to_sclist(MMAIN, "^T", do_spell, 0, TRUE); add_to_sclist(MMAIN, "^T", do_spell, 0, TRUE);
add_to_sclist(MMAIN, "F12", do_spell, 0, TRUE); add_to_sclist(MMAIN, "F12", do_spell, 0, TRUE);
#else
#ifndef DISABLE_COLOR
add_to_sclist(MMAIN, "^T", do_linter, 0, TRUE);
add_to_sclist(MMAIN, "F12", do_linter, 0, TRUE);
#endif
#endif #endif
add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0, TRUE); add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0, TRUE);
add_to_sclist(MMAIN, "F11", do_cursorpos_void, 0, TRUE); add_to_sclist(MMAIN, "F11", do_cursorpos_void, 0, TRUE);
@ -1292,6 +1294,8 @@ sc *strtosc(char *input)
s->scfunc = do_copy_text; s->scfunc = do_copy_text;
else if (!strcasecmp(input, "mark")) else if (!strcasecmp(input, "mark"))
s->scfunc = do_mark; s->scfunc = do_mark;
#endif
#ifndef DISABLE_SPELLER
else if (!strcasecmp(input, "tospell") || else if (!strcasecmp(input, "tospell") ||
!strcasecmp(input, "speller")) !strcasecmp(input, "speller"))
s->scfunc = do_spell; s->scfunc = do_spell;