mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Alerting the user when a functionless shortcut is encountered. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5526 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-01-03 17:07:29 +00:00
parent a5bc70a541
commit 0d85c8c68c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@
an addition a full refresh is needed (for multiline-regexes' sake), an addition a full refresh is needed (for multiline-regexes' sake),
instead of doing it always. instead of doing it always.
* src/color.c (reset_multis): Abort when having no multiline regexes. * src/color.c (reset_multis): Abort when having no multiline regexes.
* src/nano.c (do_input): A functionless shortcut should be impossible.
2016-01-02 Benno Schulenberg <bensberg@justemail.net> 2016-01-02 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_spell, do_formatter): Plug three tiny memory leaks. * src/text.c (do_spell, do_formatter): Plug three tiny memory leaks.

6
src/nano.c
View File

@ -1712,7 +1712,11 @@ int do_input(bool allow_funcs)
) )
preserve = TRUE; preserve = TRUE;
if (s->scfunc != 0) { if (s->scfunc == NULL) {
statusbar("Internal error: shortcut without function!");
return ERR;
}
{
const subnfunc *f = sctofunc((sc *) s); const subnfunc *f = sctofunc((sc *) s);
if (ISSET(VIEW_MODE) && f && !f->viewok) if (ISSET(VIEW_MODE) && f && !f->viewok)
print_view_warning(); print_view_warning();