Merge branch 'master' into fix-cursor-movement

3 files changed, 16 insertions, 5 deletions

diff --git a/doc/tools/convert_papermode_to_metadata.py b/doc/tools/convert_papermode_to_metadata.py
index e4010a73..57459097 100755
--- a/doc/tools/convert_papermode_to_metadata.py
+++ b/doc/tools/convert_papermode_to_metadata.py
@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python
 """
 usage: ./convert_papermode_to_metadata.py
 
diff --git a/doc/tools/performance_test.py b/doc/tools/performance_test.py
index f9562f0c..3b9099d5 100755
--- a/doc/tools/performance_test.py
+++ b/doc/tools/performance_test.py
@@ -1,6 +1,7 @@
-#!/usr/bin/python
-# pylint: disable=wrong-import-position
+#!/usr/bin/env python
+
 from __future__ import (absolute_import, division, print_function)
+
 import sys
 import time
 
diff --git a/ranger/ext/direction.py b/ranger/ext/direction.py
index bbb69c9b..e337c26e 100644
--- a/ranger/ext/direction.py
+++ b/ranger/ext/direction.py
@@ -20,6 +20,8 @@ False
 
 from __future__ import (absolute_import, division, print_function)
 
+import math
+
 
 class Direction(dict):
 
@@ -142,8 +144,16 @@ class Direction(dict):
         if self.cycle():
             cycles, pos = divmod(pos, (maximum + offset - minimum))
             self['_move_cycles'] = int(cycles)
-            return int(minimum + pos)
-        return int(max(min(pos, maximum + offset - 1), minimum))
+            ret = minimum + pos
+        else:
+            ret = max(min(pos, maximum + offset - 1), minimum)
+        # Round towards the direction we're moving from.
+        # From the UI point of view, round down. See: #912.
+        if direction < 0:
+            ret = int(math.ceil(ret))
+        else:
+            ret = int(ret)
+        return ret
 
     def move_cycles(self):
         return self.get('_move_cycles', 0)