circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-04 19:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-03-21 12:01:14 +00:00
commit 57b4d3d593
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
window-copy.c
View File

@ -2038,7 +2038,7 @@ window_copy_cursor_down(struct window_pane *wp, int scroll_only)
data->lastsx = ox;
}
if (s->sel.lineflag == LINE_SEL_RIGHT_LEFT && oy == data->sely)
if (s->sel.lineflag == LINE_SEL_RIGHT_LEFT && oy == data->endsely)
window_copy_other_end(wp);
data->cx = data->lastcx;

16
window.c
View File

@ -1272,7 +1272,7 @@ window_pane_search(struct window_pane *wp, const char *searchstr,
{
struct screen *s = &wp->base;
char *newsearchstr, *line, *msg;
u_int i;
u_int i;
msg = NULL;
xasprintf(&newsearchstr, "*%s*", searchstr);
@ -1320,17 +1320,18 @@ window_pane_find_up(struct window_pane *wp)
{
struct window_pane *next, *best, **list;
u_int edge, left, right, end, size;
int found;
int status, found;
if (wp == NULL || !window_pane_visible(wp))
return (NULL);
status = options_get_number(wp->window->options, "pane-border-status");
list = NULL;
size = 0;
edge = wp->yoff;
if (edge == 0)
edge = wp->window->sy + 1;
if (edge == (status == 1 ? 1 : 0))
edge = wp->window->sy + 1 - (status == 2 ? 1 : 0);
left = wp->xoff;
right = wp->xoff + wp->sx;
@ -1366,17 +1367,18 @@ window_pane_find_down(struct window_pane *wp)
{
struct window_pane *next, *best, **list;
u_int edge, left, right, end, size;
int found;
int status, found;
if (wp == NULL || !window_pane_visible(wp))
return (NULL);
status = options_get_number(wp->window->options, "pane-border-status");
list = NULL;
size = 0;
edge = wp->yoff + wp->sy + 1;
if (edge >= wp->window->sy)
edge = 0;
if (edge >= wp->window->sy - (status == 2 ? 1 : 0))
edge = (status == 1 ? 1 : 0);
left = wp->xoff;
right = wp->xoff + wp->sx;