mirror of
https://github.com/tmux/tmux.git
synced 2025-01-05 23:38:48 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
469a9e9439
12
screen.c
12
screen.c
@ -424,7 +424,11 @@ screen_check_selection(struct screen *s, u_int px, u_int py)
|
||||
if (py == sel->sy && px < sel->sx)
|
||||
return (0);
|
||||
|
||||
if (py == sel->ey && px > sel->ex)
|
||||
if (sel->modekeys == MODEKEY_EMACS)
|
||||
xx = (sel->ex == 0 ? 0 : sel->ex - 1);
|
||||
else
|
||||
xx = sel->ex;
|
||||
if (py == sel->ey && px > xx)
|
||||
return (0);
|
||||
} else if (sel->sy > sel->ey) {
|
||||
/* starting line > ending line -- upward selection. */
|
||||
@ -455,7 +459,11 @@ screen_check_selection(struct screen *s, u_int px, u_int py)
|
||||
return (0);
|
||||
} else {
|
||||
/* selection start (sx) is on the left */
|
||||
if (px < sel->sx || px > sel->ex)
|
||||
if (sel->modekeys == MODEKEY_EMACS)
|
||||
xx = (sel->ex == 0 ? 0 : sel->ex - 1);
|
||||
else
|
||||
xx = sel->ex;
|
||||
if (px < sel->sx || px > xx)
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user