summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-16 17:05:09 +0200
committerhut <hut@lavabit.com>2010-04-16 17:05:09 +0200
commit6e856640dcec242ab26d1648dcb2de70801d9e81 (patch)
treeeb2e83bb7f3bd6d16fd52fc44dbb413587e440a4
parentfbe99d189cdb7e0951e6afb7d55212eb096982a1 (diff)
parentaf4bcb889509557b8f71fa7809ef22a076a9d327 (diff)
downloadranger-6e856640dcec242ab26d1648dcb2de70801d9e81.tar.gz
Merge branch 'master' into devel
-rw-r--r--doc/ranger.13
-rw-r--r--ranger/data/mime.types2
-rw-r--r--ranger/defaults/apps.py2
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1
index 6adaf43f..68353dd9 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -72,6 +72,9 @@ Reload everything
 ^L
 Redraw the screen
 .TP
+S
+Open a shell in the current directory
+.TP
 yy
 Yank the selection.  (mark the files as copied)
 .TP
diff --git a/ranger/data/mime.types b/ranger/data/mime.types
index c8fa5243..35e34fdc 100644
--- a/ranger/data/mime.types
+++ b/ranger/data/mime.types
@@ -18,3 +18,5 @@ video/mkv					mkv
 video/flash					flv
 video/ogg					ogv ogm
 video/divx					div divx
+
+text/x-ruby	rb
diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index 45f2ace3..9064a7d9 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -49,7 +49,7 @@ from ranger.api.apps import *
 from ranger.ext.get_executables import get_executables
 
 INTERPRETED_LANGUAGES = re.compile(r'''
-	^(text|application)\/x-(
+	^(text|application)/x-(
 		haskell|perl|python|ruby|sh
 	)$''', re.VERBOSE)