===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/key-string.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/tmux/key-string.c	2015/11/12 22:04:37	1.29
--- src/usr.bin/tmux/key-string.c	2015/11/14 10:56:31	1.30
***************
*** 1,4 ****
! /* $OpenBSD: key-string.c,v 1.29 2015/11/12 22:04:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: key-string.c,v 1.30 2015/11/14 10:56:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 144,150 ****
  	static const char	*other = "!#()+,-.0123456789:;<=>?'\r\t";
  	key_code		 key;
  	u_short			 u;
! 	int			 size;
  	key_code		 modifiers;
  	struct utf8_data	 ud;
  	u_int			 i;
--- 144,150 ----
  	static const char	*other = "!#()+,-.0123456789:;<=>?'\r\t";
  	key_code		 key;
  	u_short			 u;
! 	int			 size, more;
  	key_code		 modifiers;
  	struct utf8_data	 ud;
  	u_int			 i;
***************
*** 177,183 ****
  			if (strlen(string) != ud.size)
  				return (KEYC_NONE);
  			for (i = 1; i < ud.size; i++)
! 				utf8_append(&ud, (u_char)string[i]);
  			key = utf8_combine(&ud);
  			return (key | modifiers);
  		}
--- 177,185 ----
  			if (strlen(string) != ud.size)
  				return (KEYC_NONE);
  			for (i = 1; i < ud.size; i++)
! 				more = utf8_append(&ud, (u_char)string[i]);
! 			if (more != 0)
! 				return (KEYC_NONE);
  			key = utf8_combine(&ud);
  			return (key | modifiers);
  		}