===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** src/usr.bin/tmux/window-copy.c	2012/03/11 23:01:19	1.77
--- src/usr.bin/tmux/window-copy.c	2012/03/17 21:40:53	1.78
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.77 2012/03/11 23:01:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.78 2012/03/17 21:40:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 984,994 ****
  	struct grid_cell	 	 gc;
  	size_t				 searchlen;
  	u_int				 i, last, fx, fy, px;
! 	int				 utf8flag, n, wrapped;
  
  	if (*searchstr == '\0')
  		return;
  	utf8flag = options_get_number(&wp->window->options, "utf8");
  	searchlen = screen_write_strlen(utf8flag, "%s", searchstr);
  
  	screen_init(&ss, searchlen, 1, 0);
--- 984,995 ----
  	struct grid_cell	 	 gc;
  	size_t				 searchlen;
  	u_int				 i, last, fx, fy, px;
! 	int				 utf8flag, n, wrapped, wrapflag;
  
  	if (*searchstr == '\0')
  		return;
  	utf8flag = options_get_number(&wp->window->options, "utf8");
+ 	wrapflag = options_get_number(&wp->window->options, "wrap-search");
  	searchlen = screen_write_strlen(utf8flag, "%s", searchstr);
  
  	screen_init(&ss, searchlen, 1, 0);
***************
*** 1021,1027 ****
  			break;
  		}
  	}
! 	if (!n && !wrapped) {
  		fx = gd->sx - 1;
  		fy = gd->hsize + gd->sy - 1;
  		wrapped = 1;
--- 1022,1028 ----
  			break;
  		}
  	}
! 	if (wrapflag && !n && !wrapped) {
  		fx = gd->sx - 1;
  		fy = gd->hsize + gd->sy - 1;
  		wrapped = 1;
***************
*** 1041,1051 ****
  	struct grid_cell	 	 gc;
  	size_t				 searchlen;
  	u_int				 i, first, fx, fy, px;
! 	int				 utf8flag, n, wrapped;
  
  	if (*searchstr == '\0')
  		return;
  	utf8flag = options_get_number(&wp->window->options, "utf8");
  	searchlen = screen_write_strlen(utf8flag, "%s", searchstr);
  
  	screen_init(&ss, searchlen, 1, 0);
--- 1042,1053 ----
  	struct grid_cell	 	 gc;
  	size_t				 searchlen;
  	u_int				 i, first, fx, fy, px;
! 	int				 utf8flag, n, wrapped, wrapflag;
  
  	if (*searchstr == '\0')
  		return;
  	utf8flag = options_get_number(&wp->window->options, "utf8");
+ 	wrapflag = options_get_number(&wp->window->options, "wrap-search");
  	searchlen = screen_write_strlen(utf8flag, "%s", searchstr);
  
  	screen_init(&ss, searchlen, 1, 0);
***************
*** 1078,1084 ****
  			break;
  		}
  	}
! 	if (!n && !wrapped) {
  		fx = 0;
  		fy = 0;
  		wrapped = 1;
--- 1080,1086 ----
  			break;
  		}
  	}
! 	if (wrapflag && !n && !wrapped) {
  		fx = 0;
  		fy = 0;
  		wrapped = 1;