===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-copy-mode.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/tmux/cmd-copy-mode.c	2020/04/10 07:44:26	1.41
--- src/usr.bin/tmux/cmd-copy-mode.c	2020/04/13 08:26:27	1.42
***************
*** 1,4 ****
! /* $OpenBSD: cmd-copy-mode.c,v 1.41 2020/04/10 07:44:26 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-copy-mode.c,v 1.42 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 56,62 ****
  static enum cmd_retval
  cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = self->args;
  	struct cmdq_shared	*shared = item->shared;
  	struct client		*c = item->client;
  	struct session		*s;
--- 56,62 ----
  static enum cmd_retval
  cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = cmd_get_args(self);
  	struct cmdq_shared	*shared = item->shared;
  	struct client		*c = item->client;
  	struct session		*s;
***************
*** 74,80 ****
  			return (CMD_RETURN_NORMAL);
  	}
  
! 	if (self->entry == &cmd_clock_mode_entry) {
  		window_pane_set_mode(wp, NULL, &window_clock_mode, NULL, NULL);
  		return (CMD_RETURN_NORMAL);
  	}
--- 74,80 ----
  			return (CMD_RETURN_NORMAL);
  	}
  
! 	if (cmd_get_entry(self) == &cmd_clock_mode_entry) {
  		window_pane_set_mode(wp, NULL, &window_clock_mode, NULL, NULL);
  		return (CMD_RETURN_NORMAL);
  	}
***************
*** 87,93 ****
  		if (args_has(args, 'M'))
  			window_copy_start_drag(c, &shared->mouse);
  	}
! 	if (args_has(self->args, 'u'))
  		window_copy_pageup(wp, 0);
  
  	return (CMD_RETURN_NORMAL);
--- 87,93 ----
  		if (args_has(args, 'M'))
  			window_copy_start_drag(c, &shared->mouse);
  	}
! 	if (args_has(args, 'u'))
  		window_copy_pageup(wp, 0);
  
  	return (CMD_RETURN_NORMAL);