From ac9daf92d72210570dc9cb63fd0058e4ff50b7a5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 6 Apr 2010 21:35:44 +0000 Subject: Merge copy mode and output mode, dropping the latter. Idea and code from Micah Cowan. --- key-bindings.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'key-bindings.c') 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); } -- cgit v1.2.3