mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-07 03:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	format.c
	osdep-openbsd.c
This commit is contained in:
Thomas Adam
2016-10-12 09:45:49 +01:00
parent 27126f8797 5c49e1d0c1
commit b9dc855016
98 changed files with 2110 additions and 2229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd-paste-buffer.c
View File

@@ -27,10 +27,7 @@
* Paste paste buffer if present.
*/
enum cmd_retval cmd_paste_buffer_exec(struct cmd *, struct cmd_q *);
void cmd_paste_buffer_filter(struct window_pane *,
const char *, size_t, const char *, int);
static enum cmd_retval cmd_paste_buffer_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_paste_buffer_entry = {
.name = "paste-buffer",
@@ -46,7 +43,7 @@ const struct cmd_entry cmd_paste_buffer_entry = {
.exec = cmd_paste_buffer_exec
};
enum cmd_retval
static enum cmd_retval
cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;