circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	cmd-link-window.c
	cmd-unlink-window.c
This commit is contained in:
Thomas Adam
2014-10-29 12:50:05 +00:00
parent 201036ad80 10a9440055
commit 35ffd093d7
21 changed files with 134 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
window.c
View File

@ -385,11 +385,11 @@ window_resize(struct window *w, u_int sx, u_int sy)
w->sy = sy;
}
void
int
window_set_active_pane(struct window *w, struct window_pane *wp)
{
if (wp == w->active)
return;
return (0);
w->last = w->active;
w->active = wp;
while (!window_pane_visible(w->active)) {
@ -397,9 +397,10 @@ window_set_active_pane(struct window *w, struct window_pane *wp)
if (w->active == NULL)
w->active = TAILQ_LAST(&w->panes, window_panes);
if (w->active == wp)
return;
return (1);
}
w->active->active_point = next_active_point++;
return (1);
}
struct window_pane *