===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-copy-mode.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/tmux/cmd-copy-mode.c	2015/04/21 15:34:32	1.20
--- src/usr.bin/tmux/cmd-copy-mode.c	2015/09/13 13:31:40	1.21
***************
*** 1,4 ****
! /* $OpenBSD: cmd-copy-mode.c,v 1.20 2015/04/21 15:34:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 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>
***************
*** 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
  };
--- 28,35 ----
  
  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
  };
***************
*** 66,72 ****
  	if (wp->mode != &window_copy_mode) {
  		if (window_pane_set_mode(wp, &window_copy_mode) != 0)
  			return (CMD_RETURN_NORMAL);
! 		window_copy_init_from_pane(wp);
  	}
  	if (args_has(args, 'M')) {
  		if (wp->mode != NULL && wp->mode != &window_copy_mode)
--- 66,72 ----
  	if (wp->mode != &window_copy_mode) {
  		if (window_pane_set_mode(wp, &window_copy_mode) != 0)
  			return (CMD_RETURN_NORMAL);
! 		window_copy_init_from_pane(wp, args_has(self->args, 'e'));
  	}
  	if (args_has(args, 'M')) {
  		if (wp->mode != NULL && wp->mode != &window_copy_mode)