===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-copy-mode.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/tmux/cmd-copy-mode.c	2015/02/09 23:18:19	1.18
--- src/usr.bin/tmux/cmd-copy-mode.c	2015/04/19 21:34:21	1.19
***************
*** 1,4 ****
! /* $OpenBSD: cmd-copy-mode.c,v 1.18 2015/02/09 23:18:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-copy-mode.c,v 1.19 2015/04/19 21:34:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 28,35 ****
  
  const struct cmd_entry cmd_copy_mode_entry = {
  	"copy-mode", NULL,
! 	"t:u", 0, 0,
! 	"[-u] " CMD_TARGET_PANE_USAGE,
  	0,
  	cmd_copy_mode_exec
  };
--- 28,35 ----
  
  const struct cmd_entry cmd_copy_mode_entry = {
  	"copy-mode", NULL,
! 	"Mt:u", 0, 0,
! 	"[-Mu] " CMD_TARGET_PANE_USAGE,
  	0,
  	cmd_copy_mode_exec
  };
***************
*** 46,54 ****
  cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
  	struct window_pane	*wp;
  
! 	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (self->entry == &cmd_clock_mode_entry) {
--- 46,61 ----
  cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	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) {
***************
*** 61,66 ****
--- 68,75 ----
  			return (CMD_RETURN_NORMAL);
  		window_copy_init_from_pane(wp);
  	}
+ 	if (args_has(args, 'M'))
+ 		window_copy_start_drag(c, &cmdq->item->mouse);
  	if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
  		window_copy_pageup(wp);