about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-01-11 21:15:45 +0100
committerhut <hut@lavabit.com>2010-01-11 21:15:45 +0100
commita82cc0eef46a063883347a9f0e1ab787d13f0853 (patch)
tree087ee1e9ebf7e6a6c758fb32b7e3579eb775dc67
parent20f5182fc5c707321e0836be9ee81a2d68dcf4cd (diff)
downloadranger-a82cc0eef46a063883347a9f0e1ab787d13f0853.tar.gz
keys: make ^C exit the program
-rw-r--r--ranger/actions.py12
-rw-r--r--ranger/defaults/keys.py2
2 files changed, 1 insertions, 13 deletions
diff --git a/ranger/actions.py b/ranger/actions.py
index 33952c19..b04c717a 100644
--- a/ranger/actions.py
+++ b/ranger/actions.py
@@ -73,18 +73,6 @@ class Actions(EnvironmentAware, SettingsAware):
 			self.search_method = order
 			self.search_forward = forward
 
-	def interrupt(self):
-		"""
-		Waits a short time.
-		If CTRL+C is pressed while waiting, the program will be exited.
-		"""
-		import time
-		self.env.key_clear()
-		try:
-			time.sleep(0.2)
-		except KeyboardInterrupt:
-			raise SystemExit()
-
 	def resize(self):
 		"""Update the size of the UI"""
 		self.ui.update_size()
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index c08f8ba2..63b9087d 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -161,7 +161,7 @@ def initialize_commands(command_list):
 	bind('ZZ', fm.exit())
 	bind(ctrl('R'), fm.reset())
 	bind('R', fm.reload_cwd())
-	bind(ctrl('C'), fm.interrupt())
+	bind(ctrl('C'), fm.exit())
 	bind(':', ';', fm.open_console(cmode.COMMAND))
 	bind('>', fm.open_console(cmode.COMMAND_QUICK))
 	bind('/', fm.open_console(cmode.SEARCH))