===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -c -r1.159 -r1.160
*** src/usr.bin/tmux/window-copy.c	2016/10/13 20:27:27	1.159
--- src/usr.bin/tmux/window-copy.c	2016/11/15 09:53:23	1.160
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.159 2016/10/13 20:27:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.160 2016/11/15 09:53:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 63,69 ****
  static void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  static void	window_copy_start_selection(struct window_pane *);
  static int	window_copy_update_selection(struct window_pane *, int);
! static void   *window_copy_get_selection(struct window_pane *, size_t *);
  static void	window_copy_copy_buffer(struct window_pane *, const char *,
  		    void *, size_t);
  static void	window_copy_copy_pipe(struct window_pane *, struct session *,
--- 63,69 ----
  static void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  static void	window_copy_start_selection(struct window_pane *);
  static int	window_copy_update_selection(struct window_pane *, int);
! static void    *window_copy_get_selection(struct window_pane *, size_t *);
  static void	window_copy_copy_buffer(struct window_pane *, const char *,
  		    void *, size_t);
  static void	window_copy_copy_pipe(struct window_pane *, struct session *,
***************
*** 761,766 ****
--- 761,770 ----
  	} else if (args->argc == 2 && *args->argv[1] != '\0') {
  		argument = args->argv[1];
  		if (strcmp(command, "copy-pipe") == 0) {
+ 			if (s != NULL)
+ 				window_copy_copy_pipe(wp, s, NULL, argument);
+ 		}
+ 		if (strcmp(command, "copy-pipe-and-cancel") == 0) {
  			if (s != NULL) {
  				window_copy_copy_pipe(wp, s, NULL, argument);
  				window_pane_reset_mode(wp);