Merge branch 'devel' into newkey

Conflicts:
	ranger/core/actions.py
	ranger/defaults/keys.py
	ranger/ext/direction.py
	ranger/gui/ui.py
	ranger/gui/widgets/browserview.py
	ranger/gui/widgets/pager.py

1 files changed, 12 insertions, 5 deletions

diff --git a/doc/pydoc/ranger.fsobject.directory.html b/doc/pydoc/ranger.fsobject.directory.html
index 3def97f7..23481285 100644
--- a/doc/pydoc/ranger.fsobject.directory.html
+++ b/doc/pydoc/ranger.fsobject.directory.html
@@ -86,6 +86,8 @@
 Methods defined here:<br>
 <dl><dt><a name="Directory-__bool__"><strong>__bool__</strong></a> = <a href="#Directory-__nonzero__">__nonzero__</a>(self)</dt></dl>
 
+<dl><dt><a name="Directory-__del__"><strong>__del__</strong></a>(self)</dt></dl>
+
 <dl><dt><a name="Directory-__eq__"><strong>__eq__</strong></a>(self, other)</dt><dd><tt>Check&nbsp;for&nbsp;equality&nbsp;of&nbsp;the&nbsp;directories&nbsp;paths</tt></dd></dl>
 
 <dl><dt><a name="Directory-__hash__"><strong>__hash__</strong></a>(self)</dt></dl>
@@ -125,6 +127,10 @@ outdated&nbsp;or&nbsp;not&nbsp;done&nbsp;yet</tt></dd></dl>
 
 <dl><dt><a name="Directory-move_to_obj"><strong>move_to_obj</strong></a>(self, arg)</dt></dl>
 
+<dl><dt><a name="Directory-request_reload"><strong>request_reload</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Directory-request_resort"><strong>request_resort</strong></a>(self)</dt></dl>
+
 <dl><dt><a name="Directory-search_fnc"><strong>search_fnc</strong></a>(self, fnc, forward<font color="#909090">=True</font>)</dt></dl>
 
 <dl><dt><a name="Directory-set_cycle_list"><strong>set_cycle_list</strong></a>(self, lst)</dt></dl>
@@ -141,6 +147,8 @@ outdated&nbsp;or&nbsp;not&nbsp;done&nbsp;yet</tt></dd></dl>
 
 <hr>
 Data and other attributes defined here:<br>
+<dl><dt><strong>content_outdated</strong> = False</dl>
+
 <dl><dt><strong>cycle_list</strong> = None</dl>
 
 <dl><dt><strong>disk_usage</strong> = 0</dl>
@@ -167,17 +175,13 @@ Data and other attributes defined here:<br>
 
 <dl><dt><strong>mount_path</strong> = '/'</dl>
 
-<dl><dt><strong>old_directories_first</strong> = None</dl>
-
 <dl><dt><strong>old_filter</strong> = None</dl>
 
 <dl><dt><strong>old_hidden_filter</strong> = None</dl>
 
-<dl><dt><strong>old_reverse</strong> = None</dl>
-
 <dl><dt><strong>old_show_hidden</strong> = None</dl>
 
-<dl><dt><strong>old_sort</strong> = None</dl>
+<dl><dt><strong>order_outdated</strong> = False</dl>
 
 <dl><dt><strong>scroll_begin</strong> = 0</dl>
 
@@ -187,6 +191,8 @@ Data and other attributes defined here:<br>
 
 <hr>
 Methods inherited from <a href="ranger.fsobject.fsobject.html#FileSystemObject">ranger.fsobject.fsobject.FileSystemObject</a>:<br>
+<dl><dt><a name="Directory-__repr__"><strong>__repr__</strong></a>(self)</dt></dl>
+
 <dl><dt><a name="Directory-__str__"><strong>__str__</strong></a>(self)</dt><dd><tt>returns&nbsp;a&nbsp;string&nbsp;containing&nbsp;the&nbsp;absolute&nbsp;path</tt></dd></dl>
 
 <dl><dt><a name="Directory-get_description"><strong>get_description</strong></a>(self)</dt></dl>
@@ -375,6 +381,7 @@ Data descriptors inherited from <a href="exceptions.html#BaseException">exceptio
     
 <tr><td bgcolor="#eeaa77"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><dl><dt><a name="-sort_by_basename"><strong>sort_by_basename</strong></a>(path)</dt><dd><tt>returns&nbsp;path.basename&nbsp;(for&nbsp;sorting)</tt></dd></dl>
+ <dl><dt><a name="-sort_by_basename_icase"><strong>sort_by_basename_icase</strong></a>(path)</dt><dd><tt>returns&nbsp;case-insensitive&nbsp;path.basename&nbsp;(for&nbsp;sorting)</tt></dd></dl>
  <dl><dt><a name="-sort_by_directory"><strong>sort_by_directory</strong></a>(path)</dt><dd><tt>returns&nbsp;0&nbsp;if&nbsp;path&nbsp;is&nbsp;a&nbsp;directory,&nbsp;otherwise&nbsp;1&nbsp;(for&nbsp;sorting)</tt></dd></dl>
  <dl><dt><a name="-time"><strong>time</strong></a>(...)</dt><dd><tt><a href="#-time">time</a>()&nbsp;-&gt;&nbsp;floating&nbsp;point&nbsp;number<br>
 &nbsp;<br>