===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -c -r1.184 -r1.185
*** src/usr.bin/tmux/format.c	2019/03/18 14:10:25	1.184
--- src/usr.bin/tmux/format.c	2019/03/18 20:53:33	1.185
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.184 2019/03/18 14:10:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.185 2019/03/18 20:53:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 972,978 ****
  }
  
  /* Skip until end. */
! static const char *
  format_skip(const char *s, const char *end)
  {
  	int	brackets = 0;
--- 972,978 ----
  }
  
  /* Skip until end. */
! const char *
  format_skip(const char *s, const char *end)
  {
  	int	brackets = 0;
***************
*** 1580,1591 ****
  
  	/* Truncate the value if needed. */
  	if (limit > 0) {
! 		new = utf8_trimcstr(value, limit);
  		format_log(ft, "applied length limit %d: %s", limit, new);
  		free(value);
  		value = new;
  	} else if (limit < 0) {
! 		new = utf8_rtrimcstr(value, -limit);
  		format_log(ft, "applied length limit %d: %s", limit, new);
  		free(value);
  		value = new;
--- 1580,1591 ----
  
  	/* Truncate the value if needed. */
  	if (limit > 0) {
! 		new = format_trim_left(value, limit);
  		format_log(ft, "applied length limit %d: %s", limit, new);
  		free(value);
  		value = new;
  	} else if (limit < 0) {
! 		new = format_trim_right(value, -limit);
  		format_log(ft, "applied length limit %d: %s", limit, new);
  		free(value);
  		value = new;