aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-06-16 10:01:21 +0100
committerThomas Adam <thomas@xteddy.org>2020-06-16 10:01:21 +0100
commiteb448daa1a07fa25a9928791cdc8411da271a9bc (patch)
treedf8e81d6e1895384dc83f59f536c51ad1af1baf6 /window-copy.c
parent824efe7be47ff534d57da1ab66c3d0dfde86992d (diff)
parent1bf9555e4f1ad19e1e6f97ede6fb19808ff1c267 (diff)
downloadrtmux-eb448daa1a07fa25a9928791cdc8411da271a9bc.tar.gz
rtmux-eb448daa1a07fa25a9928791cdc8411da271a9bc.tar.bz2
rtmux-eb448daa1a07fa25a9928791cdc8411da271a9bc.zip
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/window-copy.c b/window-copy.c
index f30d241e..7b7ab72c 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -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. */