src/usr.bin/tmux/window.c - diff

Return to window.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window.c between version 1.186 and 1.187

version 1.186, 2017/03/13 17:20:11

version 1.187, 2017/03/21 09:49:10

Line 1257

{

struct screen *s = &wp->base;

char *newsearchstr, *line, *msg;

u_int i;

msg = NULL;

xasprintf(&newsearchstr, "*%s*", searchstr);

Line 1305

{

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)

if (edge == (status == 1 ? 1 : 0))

edge = wp->window->sy + 1;

edge = wp->window->sy + 1 - (status == 2 ? 1 : 0);

left = wp->xoff;

right = wp->xoff + wp->sx;

Line 1351

Line 1352

{

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)

if (edge >= wp->window->sy - (status == 2 ? 1 : 0))

edge = 0;

edge = (status == 1 ? 1 : 0);

left = wp->xoff;

right = wp->xoff + wp->sx;