summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-14 13:29:24 +0100
committerhut <hut@lavabit.com>2010-03-14 13:29:24 +0100
commit2c8bfa0a5890fe9494a2c09e5f90613969680553 (patch)
treedc31f2349b53d2d24aa15d7dc91bbe224b32076e
parent423ce88a4b4b139d64c5258b9ac64a0c3c0b3854 (diff)
downloadranger-2c8bfa0a5890fe9494a2c09e5f90613969680553.tar.gz
Changed the local config file name from "rangerrc.py" to "options.py"
-rw-r--r--ranger/shared/settings.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 6df5241f..2d947beb 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -57,13 +57,13 @@ class SettingsAware(object):
 		if not ranger.arg.clean:
 			# overwrite single default options with custom options
 			try:
-				import rangerrc
+				import options as my_options
 			except ImportError:
 				pass
 			else:
 				for setting in ALLOWED_SETTINGS:
 					try:
-						settings[setting] = getattr(rangerrc, setting)
+						settings[setting] = getattr(my_options, setting)
 					except AttributeError:
 						pass
 
b7b'>62cd0b0 ^
974b22c ^

43dba93 ^

974b22c ^




0c2ede5 ^

b0eaf51 ^

974b22c ^

bbdf9df ^

6473848 ^

56b84d3 ^

974b22c ^

b0eaf51 ^
974b22c ^


d394fd1 ^

072bc26 ^

0c2ede5 ^

072bc26 ^

0c2ede5 ^

56b84d3 ^

475b697 ^

974b22c ^

0c2ede5 ^

1170893 ^

56b84d3 ^

974b22c ^

513e8aa ^

cef784b ^

8d20e92 ^

974b22c ^

072bc26 ^

974b22c ^



8d20e92 ^


072bc26 ^
974b22c ^
855362d ^
b0eaf51 ^


072bc26 ^
974b22c ^



b0eaf51 ^


974b22c ^
072bc26 ^
0c2ede5 ^
974b22c ^



648ca98 ^

072bc26 ^



974b22c ^
b0eaf51 ^
974b22c ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118