mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-11 22:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	window-buffer.c
This commit is contained in:
Thomas Adam
2017-06-01 18:29:36 +01:00
parent 92d86586b7 248aa54bfd
commit 73b9328c1f
8 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-find-window.c
View File

@@ -79,7 +79,7 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
xasprintf(&filter, "#{C:%s}", s); xasprintf(&filter, "#{C:%s}", s);
else if (N) else if (N)
xasprintf(&filter, "#{m:*%s*,#{window_name}}", s); xasprintf(&filter, "#{m:*%s*,#{window_name}}", s);
else if (T) else
xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s); xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
new_args = args_parse("", 1, &argv); new_args = args_parse("", 1, &argv);

3
utf8.c
View File

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