===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- src/usr.bin/tmux/server-client.c	2011/01/08 01:52:36	1.49
+++ src/usr.bin/tmux/server-client.c	2011/01/15 00:46:19	1.50
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.49 2011/01/08 01:52:36 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.50 2011/01/15 00:46:19 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -449,9 +449,14 @@
 	else
 		tty_cursor(&c->tty, wp->xoff + s->cx, wp->yoff + s->cy);
 
+	/*
+	 * Any mode will do for mouse-select-pane, but set standard mode if
+	 * none.
+	 */
 	mode = s->mode;
 	if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL &&
-	    options_get_number(oo, "mouse-select-pane"))
+	    options_get_number(oo, "mouse-select-pane") &&
+	    (mode & ALL_MOUSE_MODES) == 0)
 		mode |= MODE_MOUSE_STANDARD;
 
 	/*