Merge branch 'obsd-master'

Conflicts:
	window-buffer.c
This commit is contained in:
Thomas Adam
2017-06-01 18:29:36 +01:00
8 changed files with 8 additions and 9 deletions

3
utf8.c
View File

@ -427,8 +427,7 @@ utf8_rtrimcstr(const char *s, u_int width)
next = end - 1;
at = 0;
for (;;)
{
for (;;) {
if (at + next->width > width) {
next++;
break;