about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2009-12-27 14:13:09 +0100
committerhut <hut@lavabit.com>2009-12-27 14:13:09 +0100
commitef0ee84300be230ab5ef417f4a303d07e5b5f0b9 (patch)
tree2c2ce065aaed0646e5fba7e7b28b382e86acaabe
parent4ab0172d609bcb3f0157dc4403afb525dde507cd (diff)
downloadranger-ef0ee84300be230ab5ef417f4a303d07e5b5f0b9.tar.gz
fixes and cleanups
-rw-r--r--TODO3
-rw-r--r--ranger/applications.py1
-rw-r--r--ranger/defaults/keys.py2
-rw-r--r--ranger/gui/ui.py4
-rw-r--r--ranger/gui/widgets/console.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/TODO b/TODO
index 87da0de8..206f0445 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,7 @@ Console
    (X) #2   09/12/06  open with
    ( ) #3   09/12/06  MVC for widgets
    (X) #4   09/12/06  history for console
+   ( ) #13  09/12/27  display docstring of a command
 
 
 General
@@ -15,5 +16,5 @@ General
    (X) #8   09/12/17  Add operations to modify files/directories
    (X) #9   09/12/24  add a widget for managing running operations
    (X) #10  09/12/24  sorting
-   ( ) #11  09/12/27  filter
+   (X) #11  09/12/27  filter
    ( ) #12  09/12/27  jump through the list in a specific order
diff --git a/ranger/applications.py b/ranger/applications.py
index ae1ca2e1..d71170c7 100644
--- a/ranger/applications.py
+++ b/ranger/applications.py
@@ -42,6 +42,7 @@ def run(*args, **kw):
 	args = map(str, args)
 	popen_kw = {}
 	popen_kw['stdout'] = sys.stderr
+	popen_kw['stderr'] = sys.stderr
 
 	for word in ('shell', 'stdout', 'stdin', 'stderr'):
 		if word in kw:
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index dd17903d..75956b7a 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -1,8 +1,6 @@
-import curses
 from curses import *
 from curses.ascii import *
 from ranger import RANGERDIR
-from ranger import log
 from ranger.gui.widgets import console_mode as cmode
 from ranger.gui.widgets.console import Console
 from ranger.container.bookmarks import ALLOWED_KEYS as ALLOWED_BOOKMARK_KEYS
diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py
index 07c2de6f..974cb9d9 100644
--- a/ranger/gui/ui.py
+++ b/ranger/gui/ui.py
@@ -91,8 +91,8 @@ class UI(DisplayableContainer):
 		except:
 			return
 
-#		from ranger import log
-#		log('{0:0>28b} ({0})'.format(event.bstate))
+		# from ranger import log
+		# log('{0:0>28b} ({0})'.format(event.bstate))
 
 		if DisplayableContainer.click(self, event):
 			return
diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py
index 1e0f0b06..2d6df2a7 100644
--- a/ranger/gui/widgets/console.py
+++ b/ranger/gui/widgets/console.py
@@ -297,7 +297,7 @@ class SearchConsole(Console):
 			regexp = re.compile(self.line, re.L | re.U | re.I)
 			self.fm.env.last_search = regexp
 			if self.fm.env.pwd.search(regexp):
-				self.fm.env.cf = self.fm.env.pwd.pointed_file
+				self.fm.env.cf = self.fm.env.pwd.pointed_obj
 		Console.execute(self)