From 85a9a41ebf4092e33cb1d176b94d427c01a10e32 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Tue, 6 Apr 2010 01:29:27 +0200
Subject: updated keybindings and documentation

---
 doc/ranger.1            | 22 +++++++++++++++++++++-
 ranger/defaults/keys.py |  6 +++---
 ranger/help/movement.py | 20 +++++++++++++++++---
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/doc/ranger.1 b/doc/ranger.1
index 13f47ca2..e62cee54 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -46,7 +46,7 @@ documentation for more information on flags.
 .\"-----------------------------------------
 .SH USAGE
 .\"-----------------------------------------
-.SS Keybindings
+.SS General Keybindings
 Many keybindings take an additional numeric argument.  Type \fI5j\fR to move
 down 5 lines, \fI10<Space>\fR to mark 10 files or \fI3?\fR to read the
 third chapter of the documentation.
@@ -66,6 +66,12 @@ Move to the top
 G
 Move to the bottom
 .TP
+^R
+Reload everything
+.TP
+^L
+Redraw the screen
+.TP
 yy
 Yank the selection.  (mark the files as copied)
 .TP
@@ -111,6 +117,20 @@ Open the command console
 ?
 Opens the help screen with more keybindings and documentation
 .\"-----------------------------------------
+.SS Keybindings for using Tabs
+Tabs are used to work in different directories in the same Ranger instance.
+.TP
+g\fIN\fR
+Open a tab. N has to be a number from 0 to 9. If the tab doesn't exist yet,
+it will be created.
+.TP
+gt, gT
+Go to the next or previous tab.  You can also use TAB and SHIFT+TAB.
+.TP
+gc, ^W
+Close the current tab.  The last tab cannot be closed.
+.P
+.\"-----------------------------------------
 .SS Mouse Usage
 .TP
 Left Mouse Button
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index 6628e064..9be42a78 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -168,8 +168,8 @@ def initialize_commands(map):
 
 	# ------------------------------------------------------------ tabs
 	map('gc', ctrl('W'), fm.tab_close())
-	map('gt', fm.tab_move(1))
-	map('gT', fm.tab_move(-1))
+	map('gt', TAB, fm.tab_move(1))
+	map('gT', KEY_BTAB, fm.tab_move(-1))
 	for n in range(10):
 		map('g' + str(n), fm.tab_open(n))
 
@@ -179,7 +179,7 @@ def initialize_commands(map):
 	map('n', fm.search())
 	map('N', fm.search(forward=False))
 
-	map(TAB, fm.search(order='tag'))
+	map('ct', fm.search(order='tag'))
 	map('cc', fm.search(order='ctime'))
 	map('cm', fm.search(order='mimetype'))
 	map('cs', fm.search(order='size'))
diff --git a/ranger/help/movement.py b/ranger/help/movement.py
index a0407838..e9dd6fad 100644
--- a/ranger/help/movement.py
+++ b/ranger/help/movement.py
@@ -21,7 +21,8 @@
 1.3. Searching
 1.4. Cycling
 1.5. Bookmarks
-1.6. Mouse usage
+1.6. Tabs
+1.7. Mouse usage
 
 
 ==============================================================================
@@ -102,7 +103,7 @@ visible files. Pressing "n" will move you to the next occurance,
 "N" to the previous one.
 
 You can search for more than just strings:
-	TAB	search tagged files
+	ct	search tagged files
 	cc	cycle through all files by their ctime (last modification)
 	cm	cycle by mime type, connecting similar files
 	cs	cycle by size, large items first
@@ -134,7 +135,20 @@ Note: The ' key is equivalent to `.
 
 
 ==============================================================================
-1.6. Mouse usage
+1.6. Tabs
+
+Tabs are used to work in different directories in the same Ranger instance.
+In Ranger, tabs are very simple though and only store the directory path.
+
+	gt	Go to the next tab. (also TAB)
+	gT	Go to the previous tab. (also Shift+TAB)
+	g<N>	Open a tab. N has to be a number from 0 to 9.
+		If the tab doesn't exist yet, it will be created.
+	gc, ^W	Close the current tab.  The last tab cannot be closed.
+
+
+==============================================================================
+1.7. Mouse usage
 
 The mouse can be used to quickly enter directories which you point at,
 or to scroll around with the mouse wheel. The implementation of the mouse
-- 
cgit 1.4.1-2-gfad0