===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/usr.bin/tmux/window-copy.c	2009/12/03 22:50:10	1.35
+++ src/usr.bin/tmux/window-copy.c	2010/01/24 21:05:12	1.36
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.35 2009/12/03 22:50:10 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.36 2010/01/24 21:05:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1075,6 +1075,7 @@
 window_copy_cursor_up(struct window_pane *wp, int scroll_only)
 {
 	struct window_copy_mode_data	*data = wp->modedata;
+	struct screen			*s = &data->screen;
 	u_int				 ox, oy, px, py;
 
 	oy = screen_hsize(&wp->base) + data->cy - data->oy;
@@ -1087,12 +1088,20 @@
 	data->cx = data->lastcx;
 	if (scroll_only || data->cy == 0) {
 		window_copy_scroll_down(wp, 1);
-		if (scroll_only)
-			window_copy_redraw_lines(wp, data->cy, 2);
+		if (scroll_only) {
+			if (data->cy == screen_size_y(s) - 1)
+				window_copy_redraw_lines(wp, data->cy, 1);
+			else
+				window_copy_redraw_lines(wp, data->cy, 2);
+		}
 	} else {
 		window_copy_update_cursor(wp, data->cx, data->cy - 1);
-		if (window_copy_update_selection(wp))
-			window_copy_redraw_lines(wp, data->cy, 2);
+		if (window_copy_update_selection(wp)) {
+			if (data->cy == screen_size_y(s) - 1)
+				window_copy_redraw_lines(wp, data->cy, 1);
+			else
+				window_copy_redraw_lines(wp, data->cy, 2);
+		}
 	}
 
 	py = screen_hsize(&wp->base) + data->cy - data->oy;