summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-queue.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-04-10 07:44:26 +0000
committernicm <nicm@openbsd.org>2020-04-10 07:44:26 +0000
commitcdfe74ade09b697913dc61e107ba3b14abd8106e (patch)
tree43a1bc8ae99155ba554f58e9ee873404f296c91d /usr.bin/tmux/cmd-queue.c
parentPlace the 64bit key on the stack instead of malloc(9)in' it in pppx_if_find(). (diff)
downloadwireguard-openbsd-cdfe74ade09b697913dc61e107ba3b14abd8106e.tar.xz
wireguard-openbsd-cdfe74ade09b697913dc61e107ba3b14abd8106e.zip
Now that copy mode copies the pane content rather than keeping a
reference to it, it isn't necessary that the pane in copy mode is the same as the one copying from. Add a -s flag to copy-mode to specify a different pane for the source content. This means it is possible to view two places in a pane's history at the same time in different panes, or copy from a pane's history into an editor or shell in the same pane. From Anindya Mukherjee.
Diffstat (limited to 'usr.bin/tmux/cmd-queue.c')
-rw-r--r--usr.bin/tmux/cmd-queue.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index 5495890d951..cbc9aeefb16 100644
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.80 2020/04/03 12:59:22 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.81 2020/04/10 07:44:26 nicm Exp $ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -511,8 +511,10 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...)
} else {
wp = c->session->curw->window->active;
wme = TAILQ_FIRST(&wp->modes);
- if (wme == NULL || wme->mode != &window_view_mode)
- window_pane_set_mode(wp, &window_view_mode, NULL, NULL);
+ if (wme == NULL || wme->mode != &window_view_mode) {
+ window_pane_set_mode(wp, NULL, &window_view_mode, NULL,
+ NULL);
+ }
window_copy_add(wp, "%s", msg);
}