summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-10-01 15:13:51 +0200
committerhut <hut@lavabit.com>2011-10-01 15:13:51 +0200
commit8a68c275a22ef3a682448b2f4cfcd71c45a063b8 (patch)
treeb99913457543ff0b7162d2fcf3d44687bed366da
parentce6c90a0d88d60aa98b78ec5d072a2270c569d70 (diff)
downloadranger-8a68c275a22ef3a682448b2f4cfcd71c45a063b8.tar.gz
core.actions: renamed Actions.mark to mark_files to avoid collision
-rw-r--r--ranger/core/actions.py2
-rw-r--r--ranger/defaults/rc.conf8
2 files changed, 5 insertions, 5 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 42cb6747..9a132a42 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -356,7 +356,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 		except:
 			pass
 
-	def mark(self, all=False, toggle=False, val=None, movedown=None, narg=1):
+	def mark_files(self, all=False, toggle=False, val=None, movedown=None, narg=1):
 		"""
 		A wrapper for the directory.mark_xyz functions.
 
diff --git a/ranger/defaults/rc.conf b/ranger/defaults/rc.conf
index a6fd6098..b5ab590a 100644
--- a/ranger/defaults/rc.conf
+++ b/ranger/defaults/rc.conf
@@ -35,10 +35,10 @@ map cd console cd
 map t       tag_toggle
 map T       tag_remove
 map "<any>  tag_toggle tag=%any
-map <Space> mark toggle=True
-map v       mark all=True val=True
-map V       mark all=True val=False
-map uv      mark all=True val=False
+map <Space> mark_files toggle=True
+map v       mark_files all=True val=True
+map V       mark_files all=True val=False
+map uv      mark_files all=True val=False
 
 # VIM-like
 map gg    move to=0