===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/paste.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/tmux/paste.c	2015/10/27 15:58:42	1.32
--- src/usr.bin/tmux/paste.c	2015/11/12 11:09:11	1.33
***************
*** 1,4 ****
! /* $OpenBSD: paste.c,v 1.32 2015/10/27 15:58:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: paste.c,v 1.33 2015/11/12 11:09:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 275,281 ****
  
  /* Convert start of buffer into a nice string. */
  char *
! paste_make_sample(struct paste_buffer *pb, int utf8flag)
  {
  	char		*buf;
  	size_t		 len, used;
--- 275,281 ----
  
  /* Convert start of buffer into a nice string. */
  char *
! paste_make_sample(struct paste_buffer *pb)
  {
  	char		*buf;
  	size_t		 len, used;
***************
*** 287,296 ****
  		len = width;
  	buf = xreallocarray(NULL, len, 4 + 4);
  
! 	if (utf8flag)
! 		used = utf8_strvis(buf, pb->data, len, flags);
! 	else
! 		used = strvisx(buf, pb->data, len, flags);
  	if (pb->size > width || used > width)
  		strlcpy(buf + width, "...", 4);
  	return (buf);
--- 287,293 ----
  		len = width;
  	buf = xreallocarray(NULL, len, 4 + 4);
  
! 	used = utf8_strvis(buf, pb->data, len, flags);
  	if (pb->size > width || used > width)
  		strlcpy(buf + width, "...", 4);
  	return (buf);