mirror of https://github.com/tmux/tmux.git
Merge branch 'obsd-master'
This commit is contained in:
commit
4aa02c3743
|
@ -595,7 +595,7 @@ mode_tree_search_for(struct mode_tree_data *mtd)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (mtd->searchcb(mtd->modedata, mti->itemdata, mtd->ss))
|
if (mtd->searchcb(mtd->modedata, mti->itemdata, mtd->ss))
|
||||||
return (mti);
|
return (mti);
|
||||||
}
|
}
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
2
proc.c
2
proc.c
|
@ -45,7 +45,7 @@ struct tmuxpeer {
|
||||||
#define PEER_BAD 0x1
|
#define PEER_BAD 0x1
|
||||||
|
|
||||||
void (*dispatchcb)(struct imsg *, void *);
|
void (*dispatchcb)(struct imsg *, void *);
|
||||||
void *arg;
|
void *arg;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int peer_check_version(struct tmuxpeer *, struct imsg *);
|
static int peer_check_version(struct tmuxpeer *, struct imsg *);
|
||||||
|
|
4
tmux.h
4
tmux.h
|
@ -621,7 +621,7 @@ struct job {
|
||||||
job_free_cb freecb;
|
job_free_cb freecb;
|
||||||
void *data;
|
void *data;
|
||||||
|
|
||||||
LIST_ENTRY(job) entry;
|
LIST_ENTRY(job) entry;
|
||||||
};
|
};
|
||||||
LIST_HEAD(joblist, job);
|
LIST_HEAD(joblist, job);
|
||||||
|
|
||||||
|
@ -680,7 +680,7 @@ struct screen_write_ctx {
|
||||||
struct screen_write_collect_item *item;
|
struct screen_write_collect_item *item;
|
||||||
struct screen_write_collect_line *list;
|
struct screen_write_collect_line *list;
|
||||||
u_int scrolled;
|
u_int scrolled;
|
||||||
u_int bg;
|
u_int bg;
|
||||||
|
|
||||||
u_int cells;
|
u_int cells;
|
||||||
u_int written;
|
u_int written;
|
||||||
|
|
|
@ -237,7 +237,7 @@ window_buffer_search(__unused void *modedata, void *itemdata, const char *ss)
|
||||||
if ((pb = paste_get_name(item->name)) == NULL)
|
if ((pb = paste_get_name(item->name)) == NULL)
|
||||||
return (0);
|
return (0);
|
||||||
if (strstr(item->name, ss) != NULL)
|
if (strstr(item->name, ss) != NULL)
|
||||||
return (0);
|
return (1);
|
||||||
bufdata = paste_buffer_data(pb, &bufsize);
|
bufdata = paste_buffer_data(pb, &bufsize);
|
||||||
return (memmem(bufdata, bufsize, ss, strlen(ss)) != NULL);
|
return (memmem(bufdata, bufsize, ss, strlen(ss)) != NULL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue