From edca8aec0ff754fd30fc1ba4407c8880c4409a4f Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 21 Nov 2007 20:06:48 +0000
Subject: Don't switch to scroll mode unless no other mode.

---
 cmd-scroll-mode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmd-scroll-mode.c')

diff --git a/cmd-scroll-mode.c b/cmd-scroll-mode.c
index 3bc98825..808d8f71 100644
--- a/cmd-scroll-mode.c
+++ b/cmd-scroll-mode.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-scroll-mode.c,v 1.1 2007-11-21 13:11:41 nicm Exp $ */
+/* $Id: cmd-scroll-mode.c,v 1.2 2007-11-21 20:06:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,7 +44,7 @@ cmd_scroll_mode_exec(unused void *ptr, struct cmd_ctx *ctx)
 {
 	struct window	*w = ctx->session->curw->window;
 
-	if (ctx->flags & CMD_KEY) {
+	if (w->mode == NULL && ctx->flags & CMD_KEY) {
 		w->mode = &window_scroll_mode;
 		w->mode->init(w);
 		server_redraw_window_all(w);
-- 
cgit