summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/cmd-copy-mode.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-05-07 11:24:04 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-05-07 11:24:04 +0000
commit38d9216150f968010be06da46dbe97e7452f7418 (patch)
treeaae5267a29f8672bdaf5ad5b33ad176ec4fa135a /usr.bin/tmux/cmd-copy-mode.c
parent6003901da47a976f0919eed374ca8aebf26f604b (diff)
Treat keys in identify mode (display-panes) specially and handle them
immediately rather than queuing them (the command can block the queue which means they were not being seen until it finished which was too late). Reported by denis@ and solene@, ok solene@.
Diffstat (limited to 'usr.bin/tmux/cmd-copy-mode.c')
-rw-r--r--usr.bin/tmux/cmd-copy-mode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-copy-mode.c b/usr.bin/tmux/cmd-copy-mode.c
index 635df2a394f..8e9cb0c04be 100644
--- a/usr.bin/tmux/cmd-copy-mode.c
+++ b/usr.bin/tmux/cmd-copy-mode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-copy-mode.c,v 1.37 2019/03/12 11:16:49 nicm Exp $ */
+/* $OpenBSD: cmd-copy-mode.c,v 1.38 2019/05/07 11:24:03 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -73,10 +73,10 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_NORMAL);
}
- if (window_pane_set_mode(wp, &window_copy_mode, NULL, args) != 0)
- return (CMD_RETURN_NORMAL);
- if (args_has(args, 'M'))
- window_copy_start_drag(c, &shared->mouse);
+ if (!window_pane_set_mode(wp, &window_copy_mode, NULL, args)) {
+ if (args_has(args, 'M'))
+ window_copy_start_drag(c, &shared->mouse);
+ }
if (args_has(self->args, 'u'))
window_copy_pageup(wp, 0);