===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -c -r1.103 -r1.104
*** src/usr.bin/tmux/window-copy.c	2014/03/31 21:39:31	1.103
--- src/usr.bin/tmux/window-copy.c	2014/04/03 08:20:29	1.104
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.103 2014/03/31 21:39:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.104 2014/04/03 08:20:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 871,888 ****
  
  	/* If mouse wheel (buttons 4 and 5), scroll. */
  	if (m->event == MOUSE_EVENT_WHEEL) {
! 		if (m->wheel == MOUSE_WHEEL_UP) {
! 			for (i = 0; i < 5; i++)
  				window_copy_cursor_up(wp, 1);
! 		} else if (m->wheel == MOUSE_WHEEL_DOWN) {
! 			for (i = 0; i < 5; i++)
  				window_copy_cursor_down(wp, 1);
! 			/*
! 			 * We reached the bottom, leave copy mode,
! 			 * but only if no selection is in progress.
! 			 */
! 			if (data->oy == 0 && !s->sel.flag)
! 			    goto reset_mode;
  		}
  		return;
  	}
--- 871,889 ----
  
  	/* If mouse wheel (buttons 4 and 5), scroll. */
  	if (m->event == MOUSE_EVENT_WHEEL) {
! 		for (i = 0; i < m->scroll; i++) {
! 			if (m->wheel == MOUSE_WHEEL_UP)
  				window_copy_cursor_up(wp, 1);
! 			else {
  				window_copy_cursor_down(wp, 1);
! 
! 				/*
! 				 * We reached the bottom, leave copy mode, but
! 				 * only if no selection is in progress.
! 				 */
! 				if (data->oy == 0 && !s->sel.flag)
! 					goto reset_mode;
! 			}
  		}
  		return;
  	}