mirror of
https://github.com/tmux/tmux.git
synced 2024-12-24 01:58:46 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
61b075a263
@ -849,8 +849,10 @@ format_trim_left(const char *expanded, u_int limit)
|
||||
out += ud.size;
|
||||
}
|
||||
width += ud.width;
|
||||
} else
|
||||
} else {
|
||||
cp -= ud.have;
|
||||
cp++;
|
||||
}
|
||||
} else if (*cp > 0x1f && *cp < 0x7f) {
|
||||
if (width + 1 <= limit)
|
||||
*out++ = *cp;
|
||||
@ -896,8 +898,10 @@ format_trim_right(const char *expanded, u_int limit)
|
||||
out += ud.size;
|
||||
}
|
||||
width += ud.width;
|
||||
} else
|
||||
} else {
|
||||
cp -= ud.have;
|
||||
cp++;
|
||||
}
|
||||
} else if (*cp > 0x1f && *cp < 0x7f) {
|
||||
if (width >= skip)
|
||||
*out++ = *cp;
|
||||
|
Loading…
Reference in New Issue
Block a user