diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-04-06 21:35:44 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-04-06 21:35:44 +0000 |
| commit | ac9daf92d72210570dc9cb63fd0058e4ff50b7a5 (patch) | |
| tree | 2700d98304c50772683402bc2a34b89afa6245f0 /key-bindings.c | |
| parent | f81190a793d1b62ba12de54433c6a115db9950ca (diff) | |
Merge copy mode and output mode, dropping the latter. Idea and code from
Micah Cowan.
Diffstat (limited to 'key-bindings.c')
| -rw-r--r-- | key-bindings.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/key-bindings.c b/key-bindings.c index 2eb5327c..7b96a12d 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -211,12 +211,14 @@ key_bindings_print(struct cmd_ctx *ctx, const char *fmt, ...) struct winlink *wl = ctx->curclient->session->curw; va_list ap; - if (wl->window->active->mode != &window_more_mode) + if (wl->window->active->mode != &window_copy_mode) { window_pane_reset_mode(wl->window->active); - window_pane_set_mode(wl->window->active, &window_more_mode); + window_pane_set_mode(wl->window->active, &window_copy_mode); + window_copy_init_for_output(wl->window->active); + } va_start(ap, fmt); - window_more_vadd(wl->window->active, fmt, ap); + window_copy_vadd(wl->window->active, fmt, ap); va_end(ap); } |