diff options
| author | Micah Cowan <micah@micah.cowan.name> | 2010-04-05 05:11:44 +0000 |
|---|---|---|
| committer | Micah Cowan <micah@micah.cowan.name> | 2010-04-05 05:11:44 +0000 |
| commit | 2d74ce1d3a2f1723e77ea3983770249a12c01b0a (patch) | |
| tree | cea7facefe75f75d21b583cfa0b5d8aa91e491a9 /key-bindings.c | |
| parent | 5879e2a32b0e336f2761334d57f99c62c25e293d (diff) | |
| download | rtmux-2d74ce1d3a2f1723e77ea3983770249a12c01b0a.tar.gz rtmux-2d74ce1d3a2f1723e77ea3983770249a12c01b0a.tar.bz2 rtmux-2d74ce1d3a2f1723e77ea3983770249a12c01b0a.zip | |
Merge output (more) and copy modes into one single mode (called copy).
Diffstat (limited to 'key-bindings.c')
| -rw-r--r-- | key-bindings.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/key-bindings.c b/key-bindings.c index a78f9f3b..aa13b3a6 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -1,4 +1,4 @@ -/* $Id: key-bindings.c,v 1.89 2010-03-15 22:03:38 nicm Exp $ */ +/* $Id: key-bindings.c,v 1.90 2010-04-05 05:11:43 micahcowan Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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); } |