=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- src/usr.bin/tmux/Attic/window-choose.c 2016/04/28 07:20:26 1.76 +++ src/usr.bin/tmux/Attic/window-choose.c 2016/09/12 15:40:58 1.77 @@ -1,4 +1,4 @@ -/* $OpenBSD: window-choose.c,v 1.76 2016/04/28 07:20:26 nicm Exp $ */ +/* $OpenBSD: window-choose.c,v 1.77 2016/09/12 15:40:58 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -552,7 +552,7 @@ items = data->list_size; if (data->input_type == WINDOW_CHOOSE_GOTO_ITEM) { - switch (mode_key_lookup(&data->mdata, key, NULL)) { + switch (mode_key_lookup(&data->mdata, key, NULL, NULL)) { case MODEKEYCHOICE_CANCEL: data->input_type = WINDOW_CHOOSE_NORMAL; window_choose_redraw_screen(wp); @@ -582,7 +582,7 @@ return; } - switch (mode_key_lookup(&data->mdata, key, NULL)) { + switch (mode_key_lookup(&data->mdata, key, NULL, NULL)) { case MODEKEYCHOICE_CANCEL: window_choose_fire_callback(wp, NULL); break; @@ -837,7 +837,7 @@ int mkey; for (ptr = keys; *ptr != '\0'; ptr++) { - mkey = mode_key_lookup(&data->mdata, *ptr, NULL); + mkey = mode_key_lookup(&data->mdata, *ptr, NULL, NULL); if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER) continue; if (idx-- == 0) @@ -857,7 +857,7 @@ u_int idx = 0; for (ptr = keys; *ptr != '\0'; ptr++) { - mkey = mode_key_lookup(&data->mdata, *ptr, NULL); + mkey = mode_key_lookup(&data->mdata, *ptr, NULL, NULL); if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER) continue; if (key == (key_code)*ptr)