summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-06-16 07:28:57 +0000
committernicm <nicm@openbsd.org>2020-06-16 07:28:57 +0000
commitf0f56ebe8c6962dee0b4c8aa660ebf225899145f (patch)
tree6b31e47a725053da16064c7be18937b9e7a7d593
parentvmd(8): fix ns8250 lockup due to race condition (diff)
downloadwireguard-openbsd-f0f56ebe8c6962dee0b4c8aa660ebf225899145f.tar.xz
wireguard-openbsd-f0f56ebe8c6962dee0b4c8aa660ebf225899145f.zip
Correctly move to previous line when looking for previous word, from
Derry Jing.
-rw-r--r--usr.bin/tmux/window-copy.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index 0b15007665b..83f68865b25 100644
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.299 2020/06/11 19:43:34 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.300 2020/06/16 07:28:57 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -4535,14 +4535,14 @@ window_copy_cursor_previous_word_pos(struct window_mode_entry *wme,
separators))
break;
} else {
- if (data->cy == 0 &&
+ if (py == 0 ||
+ (data->cy == 0 &&
(screen_hsize(data->backing) == 0 ||
data->oy >=
- screen_hsize(data->backing) - 1))
+ screen_hsize(data->backing) - 1)))
goto out;
- py = screen_hsize(data->backing) + data->cy -
- data->oy;
+ py--;
px = window_copy_find_length(wme, py);
/* Stop if separator at EOL. */