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))
troduction' href='/akspecs/ranger/commit/README?h=v1.2.0&id=cfcfd885dc15547d68340da024b571c8eddccc7c'>cfcfd885 ^
712aa449
4ea0f69a ^


712aa449
0a32b684 ^


2144cf26 ^
36e4e71e ^

4ea0f69a ^

36e4e71e ^




78a7d762 ^
36e4e71e ^

78a7d762 ^
36e4e71e ^


4ea0f69a ^

36e4e71e ^
bd088c49 ^
36e4e71e ^
0a32b684 ^
36e4e71e ^

f6ae504c ^
4ea0f69a ^

0a32b684 ^

4ea0f69a ^
0a32b684 ^
4ea0f69a ^


0a32b684 ^

4ea0f69a ^



36e4e71e ^
7582555b ^
36e4e71e ^
7582555b ^








36e4e71e ^
4ea0f69a ^


36e4e71e ^




4ea0f69a ^

36e4e71e ^



f6ae504c ^
4ea0f69a ^
36e4e71e ^

4ea0f69a ^

36e4e71e ^






4ea0f69a ^

306c76d8 ^






b6aff4c3 ^

306c76d8 ^
4ea0f69a ^

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
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124