===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-copy-mode.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/cmd-copy-mode.c	2015/09/13 13:31:40	1.21
--- src/usr.bin/tmux/cmd-copy-mode.c	2015/12/13 14:32:38	1.22
***************
*** 1,4 ****
! /* $OpenBSD: cmd-copy-mode.c,v 1.21 2015/09/13 13:31:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-copy-mode.c,v 1.22 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 29,36 ****
  const struct cmd_entry cmd_copy_mode_entry = {
  	"copy-mode", NULL,
  	"Met:u", 0, 0,
! 	"[-Meu] " CMD_TARGET_PANE_USAGE,
! 	0,
  	cmd_copy_mode_exec
  };
  
--- 29,36 ----
  const struct cmd_entry cmd_copy_mode_entry = {
  	"copy-mode", NULL,
  	"Met:u", 0, 0,
! 	"[-Mu] " CMD_TARGET_PANE_USAGE,
! 	CMD_PANE_T,
  	cmd_copy_mode_exec
  };
  
***************
*** 48,62 ****
  	struct args		*args = self->args;
  	struct client		*c = cmdq->client;
  	struct session		*s;
! 	struct window_pane	*wp;
  
  	if (args_has(args, 'M')) {
  		if ((wp = cmd_mouse_pane(&cmdq->item->mouse, &s, NULL)) == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (c == NULL || c->session != s)
  			return (CMD_RETURN_NORMAL);
! 	} else if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
! 		return (CMD_RETURN_ERROR);
  
  	if (self->entry == &cmd_clock_mode_entry) {
  		window_pane_set_mode(wp, &window_clock_mode);
--- 48,61 ----
  	struct args		*args = self->args;
  	struct client		*c = cmdq->client;
  	struct session		*s;
! 	struct window_pane	*wp = cmdq->state.tflag.wp;
  
  	if (args_has(args, 'M')) {
  		if ((wp = cmd_mouse_pane(&cmdq->item->mouse, &s, NULL)) == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (c == NULL || c->session != s)
  			return (CMD_RETURN_NORMAL);
! 	}
  
  	if (self->entry == &cmd_clock_mode_entry) {
  		window_pane_set_mode(wp, &window_clock_mode);