===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-scroll-mode.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/tmux/Attic/cmd-scroll-mode.c	2009/06/01 22:58:49	1.1
+++ src/usr.bin/tmux/Attic/cmd-scroll-mode.c	2009/06/29 07:11:20	1.2
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-scroll-mode.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */
+/* $OpenBSD: cmd-scroll-mode.c,v 1.2 2009/06/29 07:11:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -60,13 +60,15 @@
 {
 	struct cmd_target_data	*data = self->data;
 	struct winlink		*wl;
+	struct window_pane	*wp;
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
+	wp = wl->window->active;
 
-	window_pane_set_mode(wl->window->active, &window_scroll_mode);
-	if (data->flags & CMD_UFLAG)
-		window_scroll_pageup(wl->window->active);
+	window_pane_set_mode(wp, &window_scroll_mode);
+	if (wp->mode == &window_scroll_mode && data->flags & CMD_UFLAG)
+		window_scroll_pageup(wp);
 
 	return (0);
 }