circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/2097/head
Thomas Adam 2020-01-08 16:01:23 +00:00
parent ed16f51e26 36eb16ce7d
commit 61b075a263
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
format-draw.c
View File

@ -849,8 +849,10 @@ format_trim_left(const char *expanded, u_int limit)
out += ud.size; out += ud.size;
} }
width += ud.width; width += ud.width;
} else } else {
cp -= ud.have; cp -= ud.have;
cp++;
}
} else if (*cp > 0x1f && *cp < 0x7f) { } else if (*cp > 0x1f && *cp < 0x7f) {
if (width + 1 <= limit) if (width + 1 <= limit)
*out++ = *cp; *out++ = *cp;
@ -896,8 +898,10 @@ format_trim_right(const char *expanded, u_int limit)
out += ud.size; out += ud.size;
} }
width += ud.width; width += ud.width;
} else } else {
cp -= ud.have; cp -= ud.have;
cp++;
}
} else if (*cp > 0x1f && *cp < 0x7f) { } else if (*cp > 0x1f && *cp < 0x7f) {
if (width >= skip) if (width >= skip)
*out++ = *cp; *out++ = *cp;