===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -c -r1.108 -r1.109
*** src/usr.bin/tmux/window-copy.c	2014/05/13 07:34:35	1.108
--- src/usr.bin/tmux/window-copy.c	2014/05/13 07:54:20	1.109
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.108 2014/05/13 07:34:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.109 2014/05/13 07:54:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 61,68 ****
  void	window_copy_copy_selection(struct window_pane *, const char *);
  void	window_copy_append_selection(struct window_pane *, const char *);
  void	window_copy_clear_selection(struct window_pane *);
! void	window_copy_copy_line(
! 	    struct window_pane *, char **, size_t *, u_int, u_int, u_int);
  int	window_copy_in_set(struct window_pane *, u_int, u_int, const char *);
  u_int	window_copy_find_length(struct window_pane *, u_int);
  void	window_copy_cursor_start_of_line(struct window_pane *);
--- 61,68 ----
  void	window_copy_copy_selection(struct window_pane *, const char *);
  void	window_copy_append_selection(struct window_pane *, const char *);
  void	window_copy_clear_selection(struct window_pane *);
! void	window_copy_copy_line(struct window_pane *, char **, size_t *, u_int,
! 	    u_int, u_int);
  int	window_copy_in_set(struct window_pane *, u_int, u_int, const char *);
  u_int	window_copy_find_length(struct window_pane *, u_int);
  void	window_copy_cursor_start_of_line(struct window_pane *);
***************
*** 95,100 ****
--- 95,101 ----
  
  enum window_copy_input_type {
  	WINDOW_COPY_OFF,
+ 	WINDOW_COPY_NAMEDBUFFER,
  	WINDOW_COPY_NUMERICPREFIX,
  	WINDOW_COPY_SEARCHUP,
  	WINDOW_COPY_SEARCHDOWN,
***************
*** 677,682 ****
--- 678,684 ----
  		case WINDOW_COPY_JUMPBACK:
  		case WINDOW_COPY_JUMPTOFORWARD:
  		case WINDOW_COPY_JUMPTOBACK:
+ 		case WINDOW_COPY_NAMEDBUFFER:
  		case WINDOW_COPY_NUMERICPREFIX:
  			break;
  		case WINDOW_COPY_SEARCHUP:
***************
*** 712,717 ****
--- 714,724 ----
  		data->inputprompt = "Goto Line";
  		*data->inputstr = '\0';
  		goto input_on;
+ 	case MODEKEYCOPY_STARTNAMEDBUFFER:
+ 		data->inputtype = WINDOW_COPY_NAMEDBUFFER;
+ 		data->inputprompt = "Buffer";
+ 		*data->inputstr = '\0';
+ 		goto input_on;
  	case MODEKEYCOPY_STARTNUMBERPREFIX:
  		key &= KEYC_MASK_KEY;
  		if (key >= '0' && key <= '9') {
***************
*** 815,820 ****
--- 822,832 ----
  			data->searchtype = data->inputtype;
  			data->searchstr = xstrdup(data->inputstr);
  			break;
+ 		case WINDOW_COPY_NAMEDBUFFER:
+ 			window_copy_copy_selection(wp, data->inputstr);
+ 			*data->inputstr = '\0';
+ 			window_pane_reset_mode(wp);
+ 			return (0);
  		case WINDOW_COPY_GOTOLINE:
  			window_copy_goto_line(wp, data->inputstr);
  			*data->inputstr = '\0';