Merge branch 'obsd-master'

Conflicts:
	format.c
This commit is contained in:
Thomas Adam
2017-05-09 15:44:13 +01:00
12 changed files with 173 additions and 83 deletions

View File

@ -902,7 +902,7 @@ retry:
log_debug("currently repeating");
/* Try to see if there is a key binding in the current table. */
bd_find.key = key;
bd_find.key = (key & ~KEYC_XTERM);
bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
if (bd != NULL) {
/*