===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- src/usr.bin/tmux/window-copy.c	2010/12/30 23:16:18	1.66
+++ src/usr.bin/tmux/window-copy.c	2011/03/28 19:44:31	1.67
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.66 2010/12/30 23:16:18 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.67 2011/03/28 19:44:31 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -368,8 +368,8 @@
 	if (np == 0)
 		np = 1;
 
-	if (data->inputtype == WINDOW_COPY_JUMPFORWARD
-	    || data->inputtype == WINDOW_COPY_JUMPBACK) {
+	if (data->inputtype == WINDOW_COPY_JUMPFORWARD ||
+	    data->inputtype == WINDOW_COPY_JUMPBACK) {
 		/* Ignore keys with modifiers. */
 		if ((key & KEYC_MASK_MOD) == 0) {
 			data->jumpchar = key;
@@ -385,7 +385,7 @@
 		data->inputtype = WINDOW_COPY_OFF;
 		window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
 		return;
-	} if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) {
+	} else if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) {
 		if (window_copy_key_numeric_prefix(wp, key) == 0)
 			return;
 		data->inputtype = WINDOW_COPY_OFF;
@@ -1617,7 +1617,7 @@
 	struct window_copy_mode_data	*data = wp->modedata;
 	struct screen			*back_s = data->backing;
 	const struct grid_cell		*gc;
-	uint				 px, py, xx;
+	u_int				 px, py, xx;
 
 	px = data->cx + 1;
 	py = screen_hsize(back_s) + data->cy - data->oy;
@@ -1643,7 +1643,7 @@
 	struct window_copy_mode_data	*data = wp->modedata;
 	struct screen			*back_s = data->backing;
 	const struct grid_cell		*gc;
-	uint				 px, py;
+	u_int				 px, py;
 
 	px = data->cx;
 	py = screen_hsize(back_s) + data->cy - data->oy;