Merge branch 'master' into cp

Conflicts:
	ranger/ext/shutil_generatorized.py

1 files changed, 7 insertions, 4 deletions

diff --git a/TODO b/TODO
index f7ad1936..169fa6d6 100644
--- a/TODO
+++ b/TODO
@@ -52,7 +52,9 @@ General
    (X) #79  10/04/08  tab number zero
    ( ) #80  10/04/08  when closing tabs, avoid gaps?
    ( ) #81  10/04/15  system crash when previewing /proc/kcore with root permissions
-   ( ) #83  10/04/19  better ways to mark files. eg by regexp, filetype,..
+   (X) #83  10/04/19  better ways to mark files. eg by regexp, filetype,..
+   ( ) #86  10/04/21  narg for move_parent
+   ( ) #60  10/02/05  utf support improvable
 
 
 Bugs
@@ -71,14 +73,14 @@ Bugs
    (X) #49  10/01/19  fix unit tests :'(
    (X) #52  10/01/23  special characters in tab completion
    (X) #54  10/01/23  max_dirsize_for_autopreview not working
-   ( ) #60  10/02/05  utf support improvable
    (X) #62  10/02/15  curs_set can raise an exception
-   ( ) #65  10/02/16  "source ranger ranger some/file.txt" shouldn't cd after exit
+   (X) #65  10/02/16  "source ranger ranger some/file.txt" shouldn't cd after exit
    (X) #67  10/03/08  terminal title in tty
    (X) #69  10/03/11  tab-completion breaks with Apps subclass
    (X) #73  10/03/21  when clicking on the first column, it goes 1x down
    (X) #74  10/03/21  console doesn't scroll
-   ( ) #78  10/03/31  broken preview when deleting all files in a directory
+   (X) #78  10/03/31  broken preview when deleting all files in a directory
+   (X) #85  10/04/26  no automatic reload of directory after using :filter
 
 
 Ideas
@@ -96,4 +98,5 @@ Ideas
    (X) #76  10/03/28  save history between sessions
    (X) #77  10/03/28  colorscheme overlay in options.py
    ( ) #82  10/04/19  :s command for batch renaming
+   ( ) #84  10/04/25  use pygments for syntax highlighting