simplify the key-interpreting logic in get_shortcut()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2017 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-10-23 13:50:57 +00:00
parent 7975408f66
commit 9abd1d18e4
1 changed files with 4 additions and 6 deletions

View File

@ -1415,12 +1415,10 @@ const shortcut *get_shortcut(const shortcut *s_list, int kbinput, bool
* 4. func_key is TRUE and the key is a function key in the
* shortcut list. */
if (kbinput != NANO_NO_KEY && ((*meta_key == FALSE &&
*func_key == FALSE && kbinput == s->ctrlval) ||
(*meta_key == TRUE && *func_key == FALSE &&
(kbinput == s->metaval || kbinput == s->miscval)) ||
(*meta_key == FALSE && *func_key == TRUE &&
kbinput == s->funcval))) {
if (kbinput != NANO_NO_KEY && kbinput == s->ctrlval ||
(*meta_key == TRUE && (kbinput == s->metaval ||
kbinput == s->miscval)) || (*func_key == TRUE &&
kbinput == s->funcval)) {
break;
}