diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-04-06 21:35:45 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-04-06 21:35:45 +0000 |
| commit | 916ca4a507e705a47aa3dba40687b0ed2087d1b3 (patch) | |
| tree | eb5c409793e3606f49eb6737286a9af92384ec90 /usr.bin/tmux/server.c | |
| parent | d8564c66217ccb969e92abb42eb7867098deda69 (diff) | |
Merge copy mode and output mode, dropping the latter. Idea and code from
Micah Cowan.
Diffstat (limited to 'usr.bin/tmux/server.c')
| -rw-r--r-- | usr.bin/tmux/server.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index c2c43a4f6b7..470d5703f87 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.84 2010/03/22 19:11:54 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.85 2010/04/06 21:35:44 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -182,10 +182,11 @@ server_start(char *path) */ if (!ARRAY_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes)) { wp = ARRAY_FIRST(&sessions)->curw->window->active; - window_pane_set_mode(wp, &window_more_mode); + window_pane_set_mode(wp, &window_copy_mode); + window_copy_init_for_output(wp); for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) { cause = ARRAY_ITEM(&cfg_causes, i); - window_more_add(wp, "%s", cause); + window_copy_add(wp, "%s", cause); xfree(cause); } ARRAY_FREE(&cfg_causes); |