mirror of
https://github.com/tmux/tmux.git
synced 2024-12-14 19:18:48 +00:00
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
Conflicts: cmd.c format.c osdep-openbsd.c
This commit is contained in:
commit
149f5bac05
6
SYNCING
6
SYNCING
@ -113,11 +113,9 @@ portable:
|
|||||||
|
|
||||||
% git log master..obsd-master
|
% git log master..obsd-master
|
||||||
|
|
||||||
From there, the merge should be a fast-forward, using the OURS strategy to
|
From there, merge the result in, fixing up any conflicts which might arise.
|
||||||
tell git that conflicts coming from OpenBSD respect the existing code in
|
|
||||||
tmux where those conflicts wouldn't arise. Hence:
|
|
||||||
|
|
||||||
% git merge -s ours obsd-master
|
% git merge obsd-master
|
||||||
|
|
||||||
Then ensure things look correct by BULDING the result of that sync:
|
Then ensure things look correct by BULDING the result of that sync:
|
||||||
|
|
||||||
|
@ -79,6 +79,15 @@ control_write(struct client *c, const char *fmt, ...)
|
|||||||
server_push_stdout(c);
|
server_push_stdout(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Write a buffer, adding a terminal newline. Empties buffer. */
|
||||||
|
void
|
||||||
|
control_write_buffer(struct client *c, struct evbuffer *buffer)
|
||||||
|
{
|
||||||
|
evbuffer_add_buffer(c->stdout_data, buffer);
|
||||||
|
evbuffer_add(c->stdout_data, "\n", 1);
|
||||||
|
server_push_stdout(c);
|
||||||
|
}
|
||||||
|
|
||||||
/* Control input callback. Read lines and fire commands. */
|
/* Control input callback. Read lines and fire commands. */
|
||||||
void
|
void
|
||||||
control_callback(struct client *c, int closed, unused void *data)
|
control_callback(struct client *c, int closed, unused void *data)
|
||||||
|
1
tmux.h
1
tmux.h
@ -2217,6 +2217,7 @@ void clear_signals(int);
|
|||||||
/* control.c */
|
/* control.c */
|
||||||
void control_callback(struct client *, int, void*);
|
void control_callback(struct client *, int, void*);
|
||||||
void printflike2 control_write(struct client *, const char *, ...);
|
void printflike2 control_write(struct client *, const char *, ...);
|
||||||
|
void control_write_buffer(struct client *, struct evbuffer *);
|
||||||
|
|
||||||
/* control-notify.c */
|
/* control-notify.c */
|
||||||
void control_notify_window_layout_changed(struct window *);
|
void control_notify_window_layout_changed(struct window *);
|
||||||
|
Loading…
Reference in New Issue
Block a user