===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/key-string.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/tmux/key-string.c	2016/01/19 15:59:12	1.34
--- src/usr.bin/tmux/key-string.c	2016/03/02 15:36:02	1.35
***************
*** 1,4 ****
! /* $OpenBSD: key-string.c,v 1.34 2016/01/19 15:59:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: key-string.c,v 1.35 2016/03/02 15:36:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 149,154 ****
--- 149,155 ----
  	struct utf8_data	 ud;
  	u_int			 i;
  	enum utf8_state		 more;
+ 	wchar_t			 wc;
  
  	/* Is this no key? */
  	if (strcasecmp(string, "None") == 0)
***************
*** 185,192 ****
  				more = utf8_append(&ud, (u_char)string[i]);
  			if (more != UTF8_DONE)
  				return (KEYC_UNKNOWN);
! 			key = utf8_combine(&ud);
! 			return (key | modifiers);
  		}
  
  		/* Otherwise look the key up in the table. */
--- 186,194 ----
  				more = utf8_append(&ud, (u_char)string[i]);
  			if (more != UTF8_DONE)
  				return (KEYC_UNKNOWN);
! 			if (utf8_combine(&ud, &wc) != UTF8_DONE)
! 				return (KEYC_UNKNOWN);
! 			return (wc | modifiers);
  		}
  
  		/* Otherwise look the key up in the table. */