circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-26 07:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-06-07 18:01:13 +01:00
commit 4aa02c3743
4 changed files with 5 additions and 5 deletions

2
mode-tree.c
View File

@ -595,7 +595,7 @@ mode_tree_search_for(struct mode_tree_data *mtd)
continue;
}
if (mtd->searchcb(mtd->modedata, mti->itemdata, mtd->ss))
return (mti);
return (mti);
}
return (NULL);
}

2
proc.c
View File

@ -45,7 +45,7 @@ struct tmuxpeer {
#define PEER_BAD 0x1
void (*dispatchcb)(struct imsg *, void *);
void *arg;
void *arg;
};
static int peer_check_version(struct tmuxpeer *, struct imsg *);

4
tmux.h
View File

@ -621,7 +621,7 @@ struct job {
job_free_cb freecb;
void *data;
LIST_ENTRY(job) entry;
LIST_ENTRY(job) entry;
};
LIST_HEAD(joblist, job);
@ -680,7 +680,7 @@ struct screen_write_ctx {
struct screen_write_collect_item *item;
struct screen_write_collect_line *list;
u_int scrolled;
u_int bg;
u_int bg;
u_int cells;
u_int written;

2
window-buffer.c
View File

@ -237,7 +237,7 @@ window_buffer_search(__unused void *modedata, void *itemdata, const char *ss)
if ((pb = paste_get_name(item->name)) == NULL)
return (0);
if (strstr(item->name, ss) != NULL)
return (0);
return (1);
bufdata = paste_buffer_data(pb, &bufsize);
return (memmem(bufdata, bufsize, ss, strlen(ss)) != NULL);
}