From 2cb2bb8257b0d9258381829752bf12b29e35547c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Wed, 7 Oct 2009 15:58:40 +0000
Subject: [PATCH] Support J and K for scroll up and scroll down in copy mode
 with vi keys, suggested by martynas.

---
 mode-key.c | 2 ++
 tmux.1     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode-key.c b/mode-key.c
index 864989de..3c15ff40 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -161,6 +161,8 @@ const struct mode_key_entry mode_key_vi_copy[] = {
 	{ '0',			0, MODEKEYCOPY_STARTOFLINE },
 	{ ':',			0, MODEKEYCOPY_GOTOLINE },
 	{ '?',			0, MODEKEYCOPY_SEARCHUP },
+	{ 'J',			0, MODEKEYCOPY_SCROLLDOWN },
+	{ 'K',			0, MODEKEYCOPY_SCROLLUP },
 	{ '\002' /* C-b */,	0, MODEKEYCOPY_PREVIOUSPAGE },
 	{ '\003' /* C-c */,	0, MODEKEYCOPY_CANCEL },
 	{ '\004' /* C-d */,	0, MODEKEYCOPY_HALFPAGEDOWN },
diff --git a/tmux.1 b/tmux.1
index 31afd505..938dba43 100644
--- a/tmux.1
+++ b/tmux.1
@@ -490,7 +490,7 @@ The keys available depend on whether emacs or vi mode is selected
 .Ic mode-keys
 option).
 The following keys are supported as appropriate for the mode:
-.Bl -column "FunctionXXXXXXXXXXXX" "viXXXXXX" "emacs" -offset indent
+.Bl -column "FunctionXXXXXXXXXXXX" "viXXXXXXXXX" "emacs" -offset indent
 .It Sy "Function" Ta Sy "vi" Ta Sy "emacs"
 .It Li "Back to indentation" Ta "^" Ta "M-m"
 .It Li "Clear selection" Ta "Escape" Ta "C-g"
@@ -509,8 +509,8 @@ The following keys are supported as appropriate for the mode:
 .It Li "Previous page" Ta "C-u" Ta "Page up"
 .It Li "Previous word" Ta "b" Ta "M-b"
 .It Li "Quit mode" Ta "q" Ta "Escape"
-.It Li "Scroll down" Ta "C-Down" Ta "C-Down"
-.It Li "Scroll up" Ta "C-Up" Ta "C-Up"
+.It Li "Scroll down" Ta "C-Down or J" Ta "C-Down"
+.It Li "Scroll up" Ta "C-Up or K" Ta "C-Up"
 .It Li "Search again" Ta "n" Ta "n"
 .It Li "Search backward" Ta "?" Ta "C-r"
 .It Li "Search forward" Ta "/" Ta "C-s"