summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-08 00:30:49 +0200
committerhut <hut@lavabit.com>2010-04-08 00:30:49 +0200
commitedf64e46b36bebc14a85e6c22280d2a6918d0bd6 (patch)
tree12cb0fee001a861432a4e0ba02871bb73ea40fd1
parent37899948600f73c014ea6e933b2cbb85e07d9f5e (diff)
parent27451fceeb0fdade34c51ef0b26e91bf50bae52a (diff)
downloadranger-edf64e46b36bebc14a85e6c22280d2a6918d0bd6.tar.gz
Merge branch 'master' into devel
Conflicts:
	ranger/core/actions.py
	ranger/defaults/keys.py
-rw-r--r--ranger/defaults/keys.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index f5b2c602..cbdf3c4c 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -26,7 +26,7 @@ fnc is a function which is called with the CommandArgument object.
 
 The CommandArgument object has these attributes:
 arg.fm: the file manager instance
-arg.wdg: the widget or ui instance
+arg.wdg: the current widget
 arg.n: the number typed before the key combination (if allowed)
 arg.keys: the string representation of the used key combination
 arg.keybuffer: the keybuffer instance
@@ -166,7 +166,6 @@ def initialize_commands(map):
 	map('gr', 'g/', fm.cd('/'))
 	map('gm', fm.cd('/media'))
 	map('gn', fm.cd('/mnt'))
-	map('gt', fm.cd('/tmp'))
 	map('gs', fm.cd('/srv'))
 	map('gR', fm.cd(RANGERDIR))