summaryrefslogtreecommitdiffstats
path: root/window-copy.c
diff options
context:
space:
mode:
authornicm <nicm>2016-11-15 09:53:23 +0000
committernicm <nicm>2016-11-15 09:53:23 +0000
commit9fe43d6acbc4468e3490f9a93df25b37c7dd18fa (patch)
tree4f37d06640a084544d270863fe0ac02c3acb7558 /window-copy.c
parentafbf0d42a7776b9431ec8fd3d6f84588dc0e5212 (diff)
Add copy-pipe-and-cancel, from Artem Fokin.
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/window-copy.c b/window-copy.c
index 507461d6..0d83db01 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -63,7 +63,7 @@ static void window_copy_goto_line(struct window_pane *, const char *);
static void window_copy_update_cursor(struct window_pane *, u_int, u_int);
static void window_copy_start_selection(struct window_pane *);
static int window_copy_update_selection(struct window_pane *, int);
-static void *window_copy_get_selection(struct window_pane *, size_t *);
+static void *window_copy_get_selection(struct window_pane *, size_t *);
static void window_copy_copy_buffer(struct window_pane *, const char *,
void *, size_t);
static void window_copy_copy_pipe(struct window_pane *, struct session *,
@@ -761,6 +761,10 @@ window_copy_command(struct window_pane *wp, struct client *c, struct session *s,
} else if (args->argc == 2 && *args->argv[1] != '\0') {
argument = args->argv[1];
if (strcmp(command, "copy-pipe") == 0) {
+ if (s != NULL)
+ window_copy_copy_pipe(wp, s, NULL, argument);
+ }
+ if (strcmp(command, "copy-pipe-and-cancel") == 0) {
if (s != NULL) {
window_copy_copy_pipe(wp, s, NULL, argument);
window_pane_reset_mode(wp);