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

Merge branch 'obsd-master' 

Conflicts:
	window-buffer.c
pull/778/merge
Thomas Adam 2017-06-01 18:29:36 +01:00
parent 92d86586b7 248aa54bfd
commit 73b9328c1f
8 changed files with 8 additions and 9 deletions
Show Stats 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);
else if (N)
xasprintf(&filter, "#{m:*%s*,#{window_name}}", s);
else if (T)
else
xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
new_args = args_parse("", 1, &argv);

2
cmd-set-option.c
View File

@ -254,7 +254,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
RB_FOREACH(w, windows, &windows)
layout_fix_panes(w, w->sx, w->sy);
}
RB_FOREACH (s, sessions, &sessions)
RB_FOREACH(s, sessions, &sessions)
status_update_saved(s);
/*

2
format.c
View File

@ -203,7 +203,7 @@ format_job_update(struct job *job)
log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, fj->out);
t = time (NULL);
t = time(NULL);
if (fj->status && fj->last != t) {
if (fj->client != NULL)
server_status_client(fj->client);

2
job.c
View File

@ -157,7 +157,7 @@ job_read_callback(__unused struct bufferevent *bufev, void *data)
struct job *job = data;
if (job->updatecb != NULL)
job->updatecb (job);
job->updatecb(job);
}
/*

2
options.c
View File

@ -114,7 +114,7 @@ options_free(struct options *oo)
{
struct options_entry *o, *tmp;
RB_FOREACH_SAFE (o, options_tree, &oo->tree, tmp)
RB_FOREACH_SAFE(o, options_tree, &oo->tree, tmp)
options_remove(o);
free(oo);
}

2
screen-write.c
View File

@ -48,7 +48,7 @@ struct screen_write_collect_item {
struct grid_cell gc;
TAILQ_ENTRY (screen_write_collect_item) entry;
TAILQ_ENTRY(screen_write_collect_item) entry;
};
struct screen_write_collect_line {
TAILQ_HEAD(, screen_write_collect_item) items;

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;

2
window-buffer.c
View File

@ -198,7 +198,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata, u_int sx, u_int sy)
screen_write_start(&ctx, NULL, &s);
screen_write_clearscreen(&ctx, 8);
pdata = end = paste_buffer_data (pb, &psize);
pdata = end = paste_buffer_data(pb, &psize);
for (i = 0; i < sy; i++) {
at = 0;
while (end != pdata + psize && *end != '\n') {