summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-31 14:24:49 +0200
committerhut <hut@lavabit.com>2010-03-31 14:24:49 +0200
commitd9c5f33bc1b1b6e4c7ce82cf8d28c1af62be78cf (patch)
treec7bd765e0ff0e9cbe733190439c2ae920a1f9322
parent5a8b6059fa54ca98f558e283696d86429222f053 (diff)
downloadranger-d9c5f33bc1b1b6e4c7ce82cf8d28c1af62be78cf.tar.gz
shared.settings: prioritize custom settings over defaults
-rw-r--r--ranger/shared/settings.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 55259218..b7f840f4 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -120,12 +120,6 @@ class SettingsAware(object):
 		settings.signal_bind('setopt.colorscheme',
 				_colorscheme_name_to_class, priority=1)
 
-		from ranger.defaults import options as default_options
-		settings._setting_sources.append(default_options)
-		assert all(hasattr(default_options, setting) \
-				for setting in ALLOWED_SETTINGS), \
-				"Ensure that all options are defined in the defaults!"
-
 		if not ranger.arg.clean:
 			# overwrite single default options with custom options
 			try:
@@ -146,6 +140,12 @@ class SettingsAware(object):
 					except AttributeError:
 						pass
 
+		from ranger.defaults import options as default_options
+		settings._setting_sources.append(default_options)
+		assert all(hasattr(default_options, setting) \
+				for setting in ALLOWED_SETTINGS), \
+				"Ensure that all options are defined in the defaults!"
+
 		try:
 			import apps
 		except ImportError: