diff options
| author | hut <hut@lavabit.com> | 2011-09-30 01:43:27 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-09-30 01:46:09 +0200 |
| commit | b1d25114617f41538f1e9e1740229f5e326c9f88 (patch) | |
| tree | 5fe8b438759ea2a9a6495e57d7266a7bd36f340a /ranger/core/helper.py | |
| parent | 5e41c8479cfba986f6dad0e68aed3c1d7b51d3ae (diff) | |
| download | ranger-b1d25114617f41538f1e9e1740229f5e326c9f88.tar.gz | |
define keybindings in rc.conf (list of commands, loaded on startup)
Diffstat (limited to 'ranger/core/helper.py')
| -rw-r--r-- | ranger/core/helper.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ranger/core/helper.py b/ranger/core/helper.py index 910c0241..62ab9091 100644 --- a/ranger/core/helper.py +++ b/ranger/core/helper.py @@ -103,22 +103,27 @@ def load_settings(fm, clean): pass from ranger.defaults import commands comcont.load_commands_from_module(commands) - commands = comcont + fm.commands = comcont # Load apps try: import apps except ImportError: from ranger.defaults import apps + fm.apps = apps.CustomApplications() - # Load keys + # Setup keymanager keymanager = ranger.core.shared.EnvironmentAware.env.keymanager ranger.api.keys.keymanager = keymanager - from ranger.defaults import keys - try: - import keys - except ImportError: - pass + + # Load rc.conf + conf = fm.confpath('rc.conf') + if os.access(conf, os.R_OK): + fm.source_cmdlist(conf) + if fm.settings.load_default_rc: + conf = fm.relpath('defaults', 'rc.conf') + if os.access(conf, os.R_OK): + fm.source_cmdlist(conf) # Load plugins try: @@ -148,15 +153,12 @@ def load_settings(fm, clean): else: comcont = ranger.api.commands.CommandContainer() ranger.api.commands.alias = comcont.alias - from ranger.api import keys keymanager = ranger.core.shared.EnvironmentAware.env.keymanager ranger.api.keys.keymanager = keymanager from ranger.defaults import commands, keys, apps comcont.load_commands_from_module(commands) - commands = comcont - fm.commands = commands - fm.keys = keys - fm.apps = apps.CustomApplications() + fm.commands = comcont + fm.apps = apps.CustomApplications() def load_apps(fm, clean): |