2010-01-17 Chris Allegretta <chrisa@asty.org>
* nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped function due to key rebinding, fixes crashes on FreeBSD repoted by Eitan Adler <eitanadlerlist@gmail.com>. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4475 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
6cf05d487f
commit
b916f5cd8b
|
@ -1626,7 +1626,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
|
||||||
#endif
|
#endif
|
||||||
iso_me_harder_funcmap(s->scfunc);
|
iso_me_harder_funcmap(s->scfunc);
|
||||||
#ifdef ENABLE_COLOR
|
#ifdef ENABLE_COLOR
|
||||||
if (!f->viewok && openfile->syntax != NULL
|
if (f && !f->viewok && openfile->syntax != NULL
|
||||||
&& openfile->syntax->nmultis > 0) {
|
&& openfile->syntax->nmultis > 0) {
|
||||||
reset_multis(openfile->current, FALSE);
|
reset_multis(openfile->current, FALSE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -229,7 +229,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
|
||||||
f = sctofunc((sc *) s);
|
f = sctofunc((sc *) s);
|
||||||
if (s->scfunc != 0 && s->execute == TRUE) {
|
if (s->scfunc != 0 && s->execute == TRUE) {
|
||||||
*ran_func = TRUE;
|
*ran_func = TRUE;
|
||||||
if (!ISSET(VIEW_MODE) || f->viewok)
|
if (f && (!ISSET(VIEW_MODE) || (f->viewok)))
|
||||||
iso_me_harder_funcmap(f->scfunc);
|
iso_me_harder_funcmap(f->scfunc);
|
||||||
}
|
}
|
||||||
*finished = TRUE;
|
*finished = TRUE;
|
||||||
|
|
Loading…
Reference in New Issue