===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -c -r1.113 -r1.114
*** src/usr.bin/tmux/window.c	2014/08/11 22:14:30	1.113
--- src/usr.bin/tmux/window.c	2014/10/21 22:22:04	1.114
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.113 2014/08/11 22:14:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.114 2014/10/21 22:22:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 386,396 ****
  	w->sy = sy;
  }
  
! void
  window_set_active_pane(struct window *w, struct window_pane *wp)
  {
  	if (wp == w->active)
! 		return;
  	w->last = w->active;
  	w->active = wp;
  	while (!window_pane_visible(w->active)) {
--- 386,396 ----
  	w->sy = sy;
  }
  
! int
  window_set_active_pane(struct window *w, struct window_pane *wp)
  {
  	if (wp == w->active)
! 		return (0);
  	w->last = w->active;
  	w->active = wp;
  	while (!window_pane_visible(w->active)) {
***************
*** 398,406 ****
  		if (w->active == NULL)
  			w->active = TAILQ_LAST(&w->panes, window_panes);
  		if (w->active == wp)
! 			return;
  	}
  	w->active->active_point = next_active_point++;
  }
  
  struct window_pane *
--- 398,407 ----
  		if (w->active == NULL)
  			w->active = TAILQ_LAST(&w->panes, window_panes);
  		if (w->active == wp)
! 			return (1);
  	}
  	w->active->active_point = next_active_point++;
+ 	return (1);
  }
  
  struct window_pane *