summaryrefslogtreecommitdiffstats
path: root/cmd-scroll-mode.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-11-21 20:06:48 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-11-21 20:06:48 +0000
commitedca8aec0ff754fd30fc1ba4407c8880c4409a4f (patch)
treeccded762ce44dbc77d686d5b3777a25a3cfa2cd7 /cmd-scroll-mode.c
parentce90f1bddb5bf3916e8f3be25277716732b15438 (diff)
Don't switch to scroll mode unless no other mode.
Diffstat (limited to 'cmd-scroll-mode.c')
-rw-r--r--cmd-scroll-mode.c4
1 files changed, 2 insertions, 2 deletions
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);