Merge branch 'stable'

Conflicts:
	CHANGELOG
	CHANGELOG.md
	doc/ranger.1
        ranger/__init__.py

6 files changed, 24 insertions, 28 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da47c5bd..bff84808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
-# 2015-05-04: version 1.7.1
+This log documents changes between stable versions.
+
+# 2015-10-04: version 1.7.2
+* Fixed file name arguments passed to `sxiv` and `feh` when using `:flat`
+* Fixed removal of empty directories when using `:rename`
+* Fixed free disk space display on Mac OS X
+* Fixed `examples/vim_file_chooser` to work with gvim too
+* Fixed some other rare crashes and bugs
+* Fixed downward mouse wheel scrolling
+* Fixed warning about regex splits being drawin in title bar since python3.5
+* Really fixed `S` key binding not working when SHELL=fish
+* Improved `doc/cheatsheet.svg`
+* Added some entries to rifle.conf
+* Added key bindings `pO` and `pP` which work like `po` and `pp` but queue the
+  operation in a first-in-first-out order.
 
+# 2015-05-04: version 1.7.1
 * Added `doc/cheatsheet.svg`
 * Added `examples/rc_emacs.conf`, a config file adding emacs-like key bindings
 * Added `env` keyword in rifle.conf
@@ -7,7 +22,6 @@
 * Fixed `S` key binding not working when SHELL=fish
 
 # 2015-04-13: version 1.7.0
-
 * The default editor is now `vim` instead of `nano`
 * Added automatic updates of tags when a file is renamed from within ranger
 * Added `preview_images_method` which can be set to `iterm2` to use native
@@ -32,7 +46,6 @@
 * Fixed broken copying of symlinks
 
 # 2013-05-24: Version 1.6.1
-
 * Added support for version control systems, see:
   http://lists.nongnu.org/archive/html/ranger-users/2013-03/msg00007.html
 * Added :scout command as a unified backend to :find, :search, etc
@@ -41,7 +54,6 @@
 * Now previewing with `i` uses the whole available width.
 
 # 2013-02-22: Version 1.6.0
-
 * Overhauled all config files.  Please update them or use the --clean switch
 * Added `examples/` directory to source code which contains sample programs or
   plugins that can be used together with ranger
@@ -80,17 +92,14 @@
 * Fixed `draw_borders=true` in combination with `padding_right=false`
 
 # 2012-08-10: Version 1.5.5
-
 * Ensure that detached programs continue to run when ranger is killed
 
 # 2012-05-03: Version 1.5.4
-
 * Added exiftool to scope.sh by default
 * Fixed a crash when entering a directory with a unicode name
 * Speedup in `ranger.ext.get_executables`
 
 # 2012-03-05: Version 1.5.3
-
 * Added --selectfile option that selects a certain file on startup
 * Added --list-tagged-files option
 * Added --cmd option to run commands on startup
@@ -113,12 +122,10 @@
 * Fixed crash when opening images with sxiv/feh by running `ranger <image>`
 
 # 2011-10-23: Version 1.5.2
-
 * Fixed graphical bug that appears in certian cases when drawing
   characters at the right edge.
 
 # 2011-10-23: Version 1.5.1
-
 * Added `fm.select_file(path)`
 * Added --choosefiles option (like --choosefile, but chooses multiple files)
 * Fixed --list-unused-keys
@@ -130,7 +137,6 @@
 * Fixed parsing of chained commands (like in the binding `om`)
 
 # 2011-10-11: Version 1.5.0
-
 * Full python3.2 compatibility
 * Added new configuration file `rc.conf` which contains a list
   of commands that are executed on startup - mainly used for keybindings
@@ -162,7 +168,6 @@
 * Countless small fixes and improvements
 
 # 2011-10-02: Version 1.4.4
-
 * Added keys for chmod (like +ow for `chmod o+w`, etc)
 * Added `c` flag for running files
 * Added various key bindings
@@ -179,24 +184,20 @@
 * Improved hints
 
 # 2011-04-05: Version 1.4.3
-
 * Fixed mimetype checking when invoking ranger with a filename
 * Fixed loss of bookmarks when disk is full
 * Minor improvements
 
 # 2011-03-05: Version 1.4.2
-
 * Added --choosefile and --choosedir flag
 * Added use of bookmarks in tab completion of the :cd command
 * Fixed bug with detached programs and python 3.2
 
 # 2011-01-04: Version 1.4.1
-
 * Fixed crash when preview failed under some circumstances
 * Fixed graphical bug when pressing i
 
 # 2010-12-22: Version 1.4.0
-
 * Added option to use any external scripts for previews (see scope.sh)
 * Added key: zv to toggle the use of the external script
 * Added indicator for the used filter (type `zf`)
@@ -214,7 +215,6 @@
 * Some restructuration of the source code
 
 # 2010-12-13: Version 1.2.3
-
 * Enable binding to alt-keys
 * Fixed memory leak in garbage collecting of old, unused directory objects
 * Fixed python3 incompatibilities
@@ -222,7 +222,6 @@
 * Fixed lazy lookup of some FSObject attributes
 
 # 2010-10-10: Version 1.2.2
-
 * Prevent currently used directories from being garbage collected
 * Disable mouse buttons when console is open
 * Fixed :cd command: Without arguments, cd's into $HOME
@@ -231,11 +230,9 @@
 * Several other clean-ups and fixes
 
 # 2010-09-16: Version 1.2.1
-
 * Fixed yy/pp bug when yanking multiple directories
 
 # 2010-09-13: Version 1.2.0
-
 * !!! Changed the default configuration directory to ~/.config/ranger !!!
 * Removed `Console Modes`, each old mode is now a simple command
 * Disabled file previews by default if ranger is used by root
@@ -249,20 +246,17 @@
 * Several clean-ups and fixes
 
 # 2010-07-17: Version 1.1.2
-
 * Fix crash when using scrollwheel to scroll down in some cases
 * The command `ranger dir1 dir2 ...` opens multiple directories in tabs
 * Removed pydoc html documentation by default, re-create it with `make doc`
 * Minor fixes
 
 # 2010-06-18: Version 1.1.1
-
 * New install script, `setup.py`
 * New flag for running programs: `w` (waits for enter press)
 * Minor fixes
 
 # 2010-06-09: Version 1.1.0
-
 * Added a man page
 * Tab support
 * Improved directory loading performance
@@ -277,3 +271,5 @@
 * New syntax for ~/.ranger/keys.py
 * Several user contributions
 * And tons of general improvements
+
+NOTE: The syntax for configuration is still subject to change.
diff --git a/README.md b/README.md
index 2ee3bcd6..f0d3ca25 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-ranger v.1.7.1
+ranger v.1.7.2
 ==============
 ranger is a console file manager with VI key bindings.  It provides a
 minimalistic and nice curses interface with a view on the directory hierarchy.
diff --git a/doc/ranger.1 b/doc/ranger.1
index ea720903..f426d5c6 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.7.1" "07/15/2015" "ranger manual"
+.TH RANGER 1 "ranger-1.7.2" "10/04/2015" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/doc/rifle.1 b/doc/rifle.1
index 3bb74dd8..32501ee0 100644
--- a/doc/rifle.1
+++ b/doc/rifle.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RIFLE 1"
-.TH RIFLE 1 "rifle-1.7.1" "05/04/2015" "rifle manual"
+.TH RIFLE 1 "rifle-1.7.2" "10/04/2015" "rifle manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/ranger/__init__.py b/ranger/__init__.py
index 8a1e7459..20c8ab35 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -14,7 +14,7 @@ import tempfile
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.7.1'
+__version__ = '1.7.2'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@hut.pm'
 
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index 4f1ef1b9..504851b1 100755
--- a/ranger/ext/rifle.py
+++ b/ranger/ext/rifle.py
@@ -19,7 +19,7 @@ import re
 from subprocess import Popen, PIPE
 import sys
 
-__version__ = 'rifle 1.7.1'
+__version__ = 'rifle 1.7.2'
 
 # Options and constants that a user might want to change:
 DEFAULT_PAGER = 'less'