Merge branch 'stable'

7 files changed, 42 insertions, 21 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a72746..5f783d9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 This log documents changes between stable versions.
 
+# 2016-12-24: version 1.8.0
+* scope.sh is now needed for the now fully scriptable image previews
+* Overhaul of version control system integration, now with threads
+* Fixed ranger not finding the location of w3mimgdisplay in most cases
+* Fixed many minor bugs
+* Added midnight-commander like multipane view, toggleable with `~` key.
+  It displays the current directory of all the open tabs next to each other.
+* Added autodetect for 256 color support in scope.sh source code preview
+* Added macro `%confdir` that expands to `~/.config/ranger` by default
+* Added possibility to toggle/cycle through options with `set <option_name>!`
+* Added `Mm`/`Ms` key to enable the linemode showing modification time
+* Added `yt`/`dt` keys to toggle whether file is in copy/cut buffer
+* Added `line_numbers` setting showing absolute/relative line numbers
+* Added `Alt-Left` and `Alt-Right` key bindings to move by words in console
+* Added previews for libreoffice files with `odt2txt`
+* Added `preview_images_method=urxvt` option for previewing images by changing
+  the urxvt background (requires urxvt compiled with pixbuf support)
+* Added `clear_filters_on_dir_change` option
+* Added Travis-CI integration
+* Changed `zi` key to toggle `preview_images` option
+* Improved PEP8 compliance
+* Improved documentation
+* Improved UI by separating file path in title bar with a space from the
+  username/hostname for quick copy&pasting by shift+double-clicking on it.
+
 # 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`
diff --git a/README.md b/README.md
index 5174f1c1..b6e1d548 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-ranger v.1.7.2
+ranger v.1.8.0
 ==============
 
 [![Build Status](https://travis-ci.org/ranger/ranger.svg?branch=master)](https://travis-ci.org/ranger/ranger)
diff --git a/doc/howto-publish-a-release.txt b/doc/howto-publish-a-release.txt
index 38cf0722..53187db1 100644
--- a/doc/howto-publish-a-release.txt
+++ b/doc/howto-publish-a-release.txt
@@ -1,6 +1,6 @@
 ( ) test everything one last time:
-( ) * make test
-( ) * ./ranger.py [--clean]
+(x) * make test
+(x) * ./ranger.py [--clean]
 ( ) * ranger/ext/rifle.py
 ( ) * make install
 ( ) make a release commit:
diff --git a/doc/ranger.1 b/doc/ranger.1
index 26a78a49..a9b4ed0a 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -133,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.7.2" "10/08/2016" "ranger manual"
+.TH RANGER 1 "ranger-1.8.0" "12/24/2016" "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 f90bb6e1..1ab9dc05 100644
--- a/doc/rifle.1
+++ b/doc/rifle.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RIFLE 1"
-.TH RIFLE 1 "rifle-1.7.2" "09/03/2016" "rifle manual"
+.TH RIFLE 1 "rifle-1.8.0" "12/24/2016" "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 9c4f8922..72a8f6e0 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -14,7 +14,7 @@ import tempfile
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.7.2'
+__version__ = '1.8.0'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@hut.pm'
 
@@ -27,7 +27,7 @@ MACRO_DELIMITER = '%'
 DEFAULT_PAGER = 'less'
 CACHEDIR = os.path.expanduser("~/.cache/ranger")
 USAGE = '%prog [options] [path]'
-VERSION = 'ranger-master %s\n\nPython %s' % (__version__, sys.version)
+VERSION = 'ranger-stable %s\n\nPython %s' % (__version__, sys.version)
 
 
 # If the environment variable XDG_CONFIG_HOME is non-empty, CONFDIR is ignored
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index f5a492b6..a9de6a2a 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.2'
+__version__ = 'rifle 1.8.0'
 
 # Options and constants that a user might want to change:
 DEFAULT_PAGER = 'less'