summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-18 17:28:30 +0200
committerhut <hut@lavabit.com>2010-04-18 17:28:30 +0200
commitc7a36d0a281ddac8ea7a7e12924c751482234b1d (patch)
tree9c611414dfeb59c90c5dd7047d2d84efea2d250e
parent06fa4ce858d9dcf1fa878182c117ae70d6e252b4 (diff)
downloadranger-c7a36d0a281ddac8ea7a7e12924c751482234b1d.tar.gz
Rename context "general" to "browser" for less ambiguity
-rw-r--r--ranger/core/environment.py2
-rw-r--r--ranger/defaults/keys.py4
-rw-r--r--ranger/gui/ui.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/ranger/core/environment.py b/ranger/core/environment.py
index 49bc8a5c..6b2d692c 100644
--- a/ranger/core/environment.py
+++ b/ranger/core/environment.py
@@ -24,7 +24,7 @@ from ranger.container import KeyBuffer, KeyManager, History
 from ranger.ext.signal_dispatcher import SignalDispatcher
 from ranger.shared import SettingsAware
 
-ALLOWED_CONTEXTS = ('general', 'pager', 'embedded_pager', 'taskview',
+ALLOWED_CONTEXTS = ('browser', 'pager', 'embedded_pager', 'taskview',
 		'console')
 
 class Environment(SettingsAware, SignalDispatcher):
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index d22d8c50..593bfbbc 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -108,9 +108,9 @@ map.dir('<C-H>', alias='<backspace>')
 
 
 # ===================================================================
-# == Define keys in "general" context:
+# == Define keys in "browser" context:
 # ===================================================================
-map = keymanager['general']
+map = keymanager['browser']
 map.merge(global_keys)
 map.merge(vim_aliases)
 
diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py
index 983cffc8..3ac45ebe 100644
--- a/ranger/gui/ui.py
+++ b/ranger/gui/ui.py
@@ -57,7 +57,7 @@ class UI(DisplayableContainer):
 			self.fm = fm
 
 		self.win = curses.initscr()
-		self.env.keymanager.use_context('general')
+		self.env.keymanager.use_context('browser')
 		self.env.keybuffer.clear()
 
 		DisplayableContainer.__init__(self, None)
@@ -139,7 +139,7 @@ class UI(DisplayableContainer):
 		if DisplayableContainer.press(self, key):
 			return
 
-		self.env.keymanager.use_context('general')
+		self.env.keymanager.use_context('browser')
 		self.env.key_append(key)
 		kbuf = self.env.keybuffer
 		cmd = kbuf.command