From 661ab7a384bbff355c3ee44c824ba8205afc23f5 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Tue, 13 Apr 2010 19:32:11 +0200
Subject: dirarg: tmp

---
 ranger/core/actions.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'ranger/core/actions.py')

diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index df623c77..929dec31 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -544,15 +544,16 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 
 	def copy(self, narg=None, dirarg=None):
 		"""Copy the selected items"""
+		cwd = self.env.cwd
 		direction = Direction(dirarg or {})
-		pos, selected = direction.select(
-				override=narg,
-				lst=self.env.cwd.files,
-				current=self.env.cwd.pointer,
-				pagesize=self.env.termsize[0])
-
-		selected = selected or self.env.get_selection()
-		self.env.copy = set(f for f in selected if f in self.env.cwd.files)
+		if direction.vertical():
+			pos, selected = direction.select(
+					override=narg, lst=cwd.files, current=currentpos,
+					pagesize=self.env.termsize[0])
+		else:
+			pos = currentpos + (narg or 0)
+			selected = (f for f in self.env.get_selection() if f in cwd.files)
+		self.env.copy = set(selected)
 		self.env.copy.add(self.env.cwd.pointed_obj)
 		self.env.cut = False
 		self.env.cwd.pointer = pos
-- 
cgit 1.4.1-2-gfad0