about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/core/fm.py3
-rw-r--r--ranger/core/helper.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index 314127ca..a98ba938 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -81,9 +81,6 @@ class FM(Actions, SignalDispatcher):
 					autosave=self.settings.autosave_bookmarks)
 			self.bookmarks.load()
 
-		else:
-			self.bookmarks = bookmarks
-
 		if not ranger.arg.clean and self.tags is None:
 			self.tags = Tags(self.confpath('tagged'))
 
diff --git a/ranger/core/helper.py b/ranger/core/helper.py
index c090a09f..dfc710c0 100644
--- a/ranger/core/helper.py
+++ b/ranger/core/helper.py
@@ -134,7 +134,7 @@ def load_settings(fm, clean):
 			ranger.fm = fm
 			for plugin in sorted(plugins):
 				try:
-					mod = __import__('plugins', fromlist=[plugin])
+					module = __import__('plugins', fromlist=[plugin])
 					fm.log.append("Loaded plugin '%s'." % module)
 				except Exception as e:
 					fm.log.append("Error in plugin '%s'" % plugin)
d=2091200c957783deed032380d56c4199a23c6b81'>2091200 ^
73e2aba ^
2091200 ^
73e2aba ^
2091200 ^
73e2aba ^
b515765 ^
12280f0 ^
3794c62 ^

f196b71 ^
04dec4c ^
338c083 ^
73e2aba ^
f196b71 ^



3794c62 ^
f196b71 ^
2d81b78 ^
3794c62 ^
04dec4c ^
3794c62 ^

338c083 ^
3794c62 ^
73e2aba ^
f6e41b0 ^
e461e60 ^
3794c62 ^
f196b71 ^

b515765 ^
04dec4c ^
19dcbc5 ^
73e2aba ^




2c477cf ^
2aef8b9 ^
10bc0ce ^

a923298 ^

2c477cf ^

338c083 ^
2c477cf ^

10bc0ce ^

















2c477cf ^
10bc0ce ^

















2c477cf ^
b515765 ^
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