===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** src/usr.bin/tmux/tty-keys.c	2017/01/11 16:05:46	1.92
--- src/usr.bin/tmux/tty-keys.c	2017/02/10 12:59:18	1.93
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.92 2017/01/11 16:05:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.93 2017/02/10 12:59:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 532,539 ****
  	key_code	 key;
  
  	/* Get key buffer. */
! 	buf = EVBUFFER_DATA(tty->event->input);
! 	len = EVBUFFER_LENGTH(tty->event->input);
  
  	if (len == 0)
  		return (0);
--- 532,539 ----
  	key_code	 key;
  
  	/* Get key buffer. */
! 	buf = EVBUFFER_DATA(tty->in);
! 	len = EVBUFFER_LENGTH(tty->in);
  
  	if (len == 0)
  		return (0);
***************
*** 645,651 ****
  		key = (key & KEYC_MASK_MOD) | KEYC_BSPACE;
  
  	/* Remove data from buffer. */
! 	evbuffer_drain(tty->event->input, size);
  
  	/* Remove key timer. */
  	if (event_initialized(&tty->key_timer))
--- 645,651 ----
  		key = (key & KEYC_MASK_MOD) | KEYC_BSPACE;
  
  	/* Remove data from buffer. */
! 	evbuffer_drain(tty->in, size);
  
  	/* Remove key timer. */
  	if (event_initialized(&tty->key_timer))
***************
*** 671,677 ****
  	log_debug("discard key %.*s %#llx", (int)size, buf, key);
  
  	/* Remove data from buffer. */
! 	evbuffer_drain(tty->event->input, size);
  
  	return (1);
  }
--- 671,677 ----
  	log_debug("discard key %.*s %#llx", (int)size, buf, key);
  
  	/* Remove data from buffer. */
! 	evbuffer_drain(tty->in, size);
  
  	return (1);
  }