===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-pane.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/cmd-select-pane.c	2015/04/19 21:05:27	1.21
--- src/usr.bin/tmux/cmd-select-pane.c	2015/04/27 07:49:36	1.22
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-pane.c,v 1.21 2015/04/19 21:05:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-select-pane.c,v 1.22 2015/04/27 07:49:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 77,88 ****
  	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
  
- 	server_unzoom_window(wp->window);
- 	if (!window_pane_visible(wp)) {
- 		cmdq_error(cmdq, "pane not visible");
- 		return (CMD_RETURN_ERROR);
- 	}
- 
  	if (args_has(self->args, 'P') || args_has(self->args, 'g')) {
  		if (args_has(args, 'P')) {
  			style = args_get(args, 'P');
--- 77,82 ----
***************
*** 111,121 ****
  		return (CMD_RETURN_ERROR);
  	}
  
! 	if (args_has(self->args, 'e'))
  		wp->flags &= ~PANE_INPUTOFF;
! 	else if (args_has(self->args, 'd'))
  		wp->flags |= PANE_INPUTOFF;
! 	else if (window_set_active_pane(wl->window, wp)) {
  		server_status_window(wl->window);
  		server_redraw_window_borders(wl->window);
  	}
--- 105,127 ----
  		return (CMD_RETURN_ERROR);
  	}
  
! 	if (args_has(self->args, 'e')) {
  		wp->flags &= ~PANE_INPUTOFF;
! 		return (CMD_RETURN_NORMAL);
! 	}
! 	if (args_has(self->args, 'd')) {
  		wp->flags |= PANE_INPUTOFF;
! 		return (CMD_RETURN_NORMAL);
! 	}
! 
! 	if (wp == wl->window->active)
! 		return (CMD_RETURN_NORMAL);
! 	server_unzoom_window(wp->window);
! 	if (!window_pane_visible(wp)) {
! 		cmdq_error(cmdq, "pane not visible");
! 		return (CMD_RETURN_ERROR);
! 	}
! 	if (window_set_active_pane(wl->window, wp)) {
  		server_status_window(wl->window);
  		server_redraw_window_borders(wl->window);
  	}