From 1b5c7bd54ac76a3e62a28762402b4db2df5d9e2a Mon Sep 17 00:00:00 2001
From: Wojciech Siewierski <wojciech.siewierski@onet.pl>
Date: Mon, 30 Mar 2015 18:54:57 +0200
Subject: new linemode with the information from file(1)

---
 doc/ranger.1   | 8 ++++++--
 doc/ranger.pod | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ranger.1 b/doc/ranger.1
index 3ba4fe4e..8a1e00c1 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.6.1" "03/03/2015" "ranger manual"
+.TH RANGER 1 "ranger-1.6.1" "30/03/15" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -1006,13 +1006,17 @@ Looks for a string in all marked files or directories.
 .IX Item "linemode linemodename"
 Sets the linemode of all files in the current directory.  The linemode may be:
 .Sp
-.Vb 5
+.Vb 6
 \& "filename": display each line as "<basename>...<size>"
+\& "fileinfo": display each line as "<basename>...<file(1) output>"
 \& "permissions": display each line as "<permissions> <owner> <group> <basename>"
 \& "metatitle": display metadata from .metadata.json files if
 \&     available, fall back to the "filename" linemode if no
 \&     metadata was found.  See :meta command.
 .Ve
+.Sp
+The custom linemodes may be added by subclassing the \fILinemodeBase\fR class.
+See the \fIranger.core.linemode\fR module for some examples.
 .IP "load_copy_buffer" 2
 .IX Item "load_copy_buffer"
 Load the copy buffer from \fI~/.config/ranger/copy_buffer\fR.  This can be used to
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 336a886c..a6204403 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -1046,6 +1046,7 @@ Looks for a string in all marked files or directories.
 Sets the linemode of all files in the current directory.  The linemode may be:
 
  "filename": display each line as "<basename>...<size>"
+ "fileinfo": display each line as "<basename>...<file(1) output>"
  "permissions": display each line as "<permissions> <owner> <group> <basename>"
  "metatitle": display metadata from .metadata.json files if
      available, fall back to the "filename" linemode if no
-- 
cgit 1.4.1-2-gfad0


From 3c2862ea9b84d4f2e4ecd416c0db66db2dad58ba Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Thu, 9 Apr 2015 16:37:50 +0200
Subject: examples/bash_automatic_cd.sh: use mktemp

This is a follow-up to #282
---
 doc/examples/bash_automatic_cd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/bash_automatic_cd.sh b/doc/examples/bash_automatic_cd.sh
index 8d72c553..465c9c80 100644
--- a/doc/examples/bash_automatic_cd.sh
+++ b/doc/examples/bash_automatic_cd.sh
@@ -8,7 +8,7 @@
 # original directory.
 
 function ranger-cd {
-    tempfile='/tmp/chosendir'
+    tempfile="$(mktemp)"
     /usr/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}"
     test -f "$tempfile" &&
     if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
-- 
cgit 1.4.1-2-gfad0


From 3160c4a7ebedf85c068baa4bae6747cafc123d4b Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Fri, 10 Apr 2015 00:12:46 +0200
Subject: ranger.1: added documentation for %rangerdir and %space macros

---
 doc/ranger.1   | 10 +++++++++-
 doc/ranger.pod |  8 ++++++++
 doc/rifle.1    |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ranger.1 b/doc/ranger.1
index 8a1e00c1..295314f4 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.6.1" "30/03/15" "ranger manual"
+.TH RANGER 1 "ranger-1.6.1" "04/10/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
@@ -321,6 +321,14 @@ Macros for file paths are generally shell-escaped so they can be used in the
 Additionally, if you create a key binding that uses <any>, a special statement
 which accepts any key, then the macro \f(CW%any\fR (or \f(CW%any0\fR, \f(CW%any1\fR, \f(CW%any2\fR, ...) can be
 used in the command to get the key that was pressed.
+.PP
+The macro \f(CW%rangerdir\fR expands to the directory of ranger's python library, you
+can use it for something like this command:
+  alias show_commands shell less \f(CW%rangerdir\fR/config/commands.py
+.PP
+The macro \f(CW%space\fR expands to a space character. You can use it to add spaces to
+the end of a command when needed, while preventing editors to strip spaces off
+the end of the line automatically.
 .SS "\s-1BOOKMARKS\s0"
 .IX Subsection "BOOKMARKS"
 Type \fBm<key>\fR to bookmark the current directory. You can re-enter this
diff --git a/doc/ranger.pod b/doc/ranger.pod
index a6204403..ad75f35a 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -218,6 +218,14 @@ Additionally, if you create a key binding that uses <any>, a special statement
 which accepts any key, then the macro %any (or %any0, %any1, %any2, ...) can be
 used in the command to get the key that was pressed.
 
+The macro %rangerdir expands to the directory of ranger's python library, you
+can use it for something like this command:
+  alias show_commands shell less %rangerdir/config/commands.py
+
+The macro %space expands to a space character. You can use it to add spaces to
+the end of a command when needed, while preventing editors to strip spaces off
+the end of the line automatically.
+
 =head2 BOOKMARKS
 
 Type B<m<keyE<gt>> to bookmark the current directory. You can re-enter this
diff --git a/doc/rifle.1 b/doc/rifle.1
index 999d56d6..21c53276 100644
--- a/doc/rifle.1
+++ b/doc/rifle.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RIFLE 1"
-.TH RIFLE 1 "rifle-1.6.1" "08/26/2014" "rifle manual"
+.TH RIFLE 1 "rifle-1.6.1" "04/10/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
-- 
cgit 1.4.1-2-gfad0


From 28e23ddcde292efd2968e44d2781e387cba5618f Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Mon, 13 Apr 2015 12:41:52 +0200
Subject: doc/ranger.1: added entries for :help and :setintag

---
 doc/ranger.1   | 12 +++++++++++-
 doc/ranger.pod | 12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ranger.1 b/doc/ranger.1
index 295314f4..e5400efb 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.6.1" "04/10/2015" "ranger manual"
+.TH RANGER 1 "ranger-1.6.1" "04/13/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
@@ -853,6 +853,7 @@ ranger.  For your convenience, this is a list of the \*(L"public\*(R" commands i
 \& find pattern
 \& flat level
 \& grep pattern
+\& help
 \& linemode linemodename
 \& load_copy_buffer
 \& map key command
@@ -874,6 +875,7 @@ ranger.  For your convenience, this is a list of the \*(L"public\*(R" commands i
 \& search pattern
 \& search_inc pattern
 \& set option value
+\& setintag tags option value
 \& setlocal [path=<path>] option value
 \& shell [\-FLAGS] command
 \& terminal
@@ -1010,6 +1012,9 @@ values \-2 and less are invalid.
 .IP "grep \fIpattern\fR" 2
 .IX Item "grep pattern"
 Looks for a string in all marked files or directories.
+.IP "help" 2
+.IX Item "help"
+Provides a quick way to view ranger documentations.
 .IP "linemode \fIlinemodename\fR" 2
 .IX Item "linemode linemodename"
 Sets the linemode of all files in the current directory.  The linemode may be:
@@ -1157,6 +1162,11 @@ doesn't work for functions and regular expressions. Valid values are:
 \& list           | 1,2,3,4
 \& none           | none
 .Ve
+.IP "setintag \fItags\fR \fIoption\fR \fIvalue\fR" 2
+.IX Item "setintag tags option value"
+Assigns a new value to an option, but locally for the directories that are
+marked with \fItag\fR.  This means, that this option only takes effect when
+visiting that directory.
 .IP "setlocal [path=\fIpath\fR] \fIoption\fR \fIvalue\fR" 2
 .IX Item "setlocal [path=path] option value"
 Assigns a new value to an option, but locally for the directory given by
diff --git a/doc/ranger.pod b/doc/ranger.pod
index ad75f35a..0ac79e12 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -869,6 +869,7 @@ ranger.  For your convenience, this is a list of the "public" commands including
  find pattern
  flat level
  grep pattern
+ help
  linemode linemodename
  load_copy_buffer
  map key command
@@ -890,6 +891,7 @@ ranger.  For your convenience, this is a list of the "public" commands including
  search pattern
  search_inc pattern
  set option value
+ setintag tags option value
  setlocal [path=<path>] option value
  shell [-FLAGS] command
  terminal
@@ -1049,6 +1051,10 @@ values -2 and less are invalid.
 
 Looks for a string in all marked files or directories.
 
+=item help
+
+Provides a quick way to view ranger documentations.
+
 =item linemode I<linemodename>
 
 Sets the linemode of all files in the current directory.  The linemode may be:
@@ -1209,6 +1215,12 @@ doesn't work for functions and regular expressions. Valid values are:
  list           | 1,2,3,4
  none           | none
 
+=item setintag I<tags> I<option> I<value>
+
+Assigns a new value to an option, but locally for the directories that are
+marked with I<tag>.  This means, that this option only takes effect when
+visiting that directory.
+
 =item setlocal [path=I<path>] I<option> I<value>
 
 Assigns a new value to an option, but locally for the directory given by
-- 
cgit 1.4.1-2-gfad0


From a9bbdc440c2ea33ccc4470e00949ffa16ce2300e Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Mon, 13 Apr 2015 12:48:00 +0200
Subject: doc/ranger.1: updated RESOURCES section

---
 doc/ranger.1   | 9 +++++++--
 doc/ranger.pod | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/ranger.1 b/doc/ranger.1
index e5400efb..c4896b2e 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -155,8 +155,8 @@ ranger is a console file manager with \s-1VI\s0 key bindings.
 .IX Header "RESOURCES"
 \&\fIThis manual\fR contains instructions on how to use and configure ranger.
 .PP
-\&\fIInside ranger\fR, you can press \fI1?\fR for a list of key bindings, \fI2?\fR for
-commands and \fI3?\fR for settings.
+\&\fIInside ranger\fR, you can press \fI?\fR for a list of key bindings, commands or
+settings.
 .PP
 The \fI\s-1README\s0\fR contains install instructions.
 .PP
@@ -166,6 +166,11 @@ The directory \fIdoc/configs\fR contains configuration files.  They are usually
 installed to \fI/usr/lib/python*/site\-packages/ranger/config\fR and can be
 obtained with ranger's \-\-copy\-config option.
 .PP
+The directory \fIdoc/examples\fR contains reference implementations for ranger
+plugins, sample configuration files and some programs for integrating ranger
+with other software.  They are usually installed to
+\&\fI/usr/lib/python*/site\-packages/ranger/examples\fR.
+.PP
 The man page of \fIrifle\fR\|(1) describes the functions of the file opener
 .PP
 The section \fI\s-1LINKS\s0\fR of this man page contains further resources.
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 0ac79e12..5c150d7a 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -28,8 +28,8 @@ ranger is a console file manager with VI key bindings.
 
 I<This manual> contains instructions on how to use and configure ranger.
 
-I<Inside ranger>, you can press I<1?> for a list of key bindings, I<2?> for
-commands and I<3?> for settings.
+I<Inside ranger>, you can press I<?> for a list of key bindings, commands or
+settings.
 
 The F<README> contains install instructions.
 
@@ -39,6 +39,11 @@ The directory F<doc/configs> contains configuration files.  They are usually
 installed to F</usr/lib/python*/site-packages/ranger/config> and can be
 obtained with ranger's --copy-config option.
 
+The directory F<doc/examples> contains reference implementations for ranger
+plugins, sample configuration files and some programs for integrating ranger
+with other software.  They are usually installed to
+F</usr/lib/python*/site-packages/ranger/examples>.
+
 The man page of rifle(1) describes the functions of the file opener
 
 The section I<LINKS> of this man page contains further resources.
-- 
cgit 1.4.1-2-gfad0


From c0f2fc72eccb4127fba5f48ce4b422487d6ec752 Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Mon, 13 Apr 2015 12:49:49 +0200
Subject: moved "doc/examples" to "examples" for more visibility

---
 doc/examples/README                           |  8 -----
 doc/examples/bash_automatic_cd.sh             | 21 ------------
 doc/examples/bash_subshell_notice.sh          |  7 ----
 doc/examples/plugin_chmod_keybindings.py      | 20 -----------
 doc/examples/plugin_file_filter.py            | 21 ------------
 doc/examples/plugin_hello_world.py            | 23 -------------
 doc/examples/plugin_new_macro.py              | 19 -----------
 doc/examples/plugin_new_sorting_method.py     |  9 -----
 doc/examples/rifle_different_file_opener.conf |  9 -----
 doc/examples/rifle_sxiv.sh                    | 48 ---------------------------
 doc/examples/vim_file_chooser.vim             | 36 --------------------
 doc/ranger.1                                  |  2 +-
 doc/ranger.pod                                |  2 +-
 examples/README                               |  8 +++++
 examples/bash_automatic_cd.sh                 | 21 ++++++++++++
 examples/bash_subshell_notice.sh              |  7 ++++
 examples/plugin_chmod_keybindings.py          | 20 +++++++++++
 examples/plugin_file_filter.py                | 21 ++++++++++++
 examples/plugin_hello_world.py                | 23 +++++++++++++
 examples/plugin_new_macro.py                  | 19 +++++++++++
 examples/plugin_new_sorting_method.py         |  9 +++++
 examples/rifle_different_file_opener.conf     |  9 +++++
 examples/rifle_sxiv.sh                        | 48 +++++++++++++++++++++++++++
 examples/vim_file_chooser.vim                 | 36 ++++++++++++++++++++
 setup.py                                      |  2 +-
 25 files changed, 224 insertions(+), 224 deletions(-)
 delete mode 100644 doc/examples/README
 delete mode 100644 doc/examples/bash_automatic_cd.sh
 delete mode 100644 doc/examples/bash_subshell_notice.sh
 delete mode 100644 doc/examples/plugin_chmod_keybindings.py
 delete mode 100644 doc/examples/plugin_file_filter.py
 delete mode 100644 doc/examples/plugin_hello_world.py
 delete mode 100644 doc/examples/plugin_new_macro.py
 delete mode 100644 doc/examples/plugin_new_sorting_method.py
 delete mode 100644 doc/examples/rifle_different_file_opener.conf
 delete mode 100755 doc/examples/rifle_sxiv.sh
 delete mode 100644 doc/examples/vim_file_chooser.vim
 create mode 100644 examples/README
 create mode 100644 examples/bash_automatic_cd.sh
 create mode 100644 examples/bash_subshell_notice.sh
 create mode 100644 examples/plugin_chmod_keybindings.py
 create mode 100644 examples/plugin_file_filter.py
 create mode 100644 examples/plugin_hello_world.py
 create mode 100644 examples/plugin_new_macro.py
 create mode 100644 examples/plugin_new_sorting_method.py
 create mode 100644 examples/rifle_different_file_opener.conf
 create mode 100755 examples/rifle_sxiv.sh
 create mode 100644 examples/vim_file_chooser.vim

(limited to 'doc')

diff --git a/doc/examples/README b/doc/examples/README
deleted file mode 100644
index ca514853..00000000
--- a/doc/examples/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The files in this directory contain applications or extensions of ranger which
-are put here for your inspiration and as references.
-
-In order to use a plugin from this directory, you need to copy it to
-~/.config/ranger/plugins/
-
-Note that if you update ranger to a new minor version (for example,
-from 1.6.* to 1.7.0), your outdated plugins WILL break and crash ranger.
diff --git a/doc/examples/bash_automatic_cd.sh b/doc/examples/bash_automatic_cd.sh
deleted file mode 100644
index 465c9c80..00000000
--- a/doc/examples/bash_automatic_cd.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Compatible with ranger 1.4.2 through 1.6.*
-#
-# Automatically change the directory in bash after closing ranger
-#
-# This is a bash function for .bashrc to automatically change the directory to
-# the last visited one after ranger quits.
-# To undo the effect of this function, you can type "cd -" to return to the
-# original directory.
-
-function ranger-cd {
-    tempfile="$(mktemp)"
-    /usr/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}"
-    test -f "$tempfile" &&
-    if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
-        cd -- "$(cat "$tempfile")"
-    fi
-    rm -f -- "$tempfile"
-}
-
-# This binds Ctrl-O to ranger-cd:
-bind '"\C-o":"ranger-cd\C-m"'
diff --git a/doc/examples/bash_subshell_notice.sh b/doc/examples/bash_subshell_notice.sh
deleted file mode 100644
index bc44d5a8..00000000
--- a/doc/examples/bash_subshell_notice.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Compatible with ranger 1.5.3 through 1.6.*
-#
-# Change the prompt when you open a shell from inside ranger
-#
-# Add this line to your .bashrc for it to work.
-
-[ -n "$RANGER_LEVEL" ] && PS1="$PS1"'(in ranger) '
diff --git a/doc/examples/plugin_chmod_keybindings.py b/doc/examples/plugin_chmod_keybindings.py
deleted file mode 100644
index 0ab975ed..00000000
--- a/doc/examples/plugin_chmod_keybindings.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Compatible with ranger 1.6.*
-#
-# This plugin serves as an example for adding key bindings through a plugin.
-# It could replace the ten lines in the rc.conf that create the key bindings
-# for the "chmod" command.
-
-import ranger.api
-old_hook_init = ranger.api.hook_init
-
-def hook_init(fm):
-    old_hook_init(fm)
-
-    # Generate key bindings for the chmod command
-    command = "map {0}{1}{2} shell -d chmod {1}{0}{2} %s"
-    for mode in list('ugoa') + ['']:
-        for perm in "rwxXst":
-            fm.execute_console(command.format('-', mode, perm))
-            fm.execute_console(command.format('+', mode, perm))
-
-ranger.api.hook_init = hook_init
diff --git a/doc/examples/plugin_file_filter.py b/doc/examples/plugin_file_filter.py
deleted file mode 100644
index b9bea1f3..00000000
--- a/doc/examples/plugin_file_filter.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Compatible since ranger 1.6.1, git commit c82a8a76989c
-#
-# This plugin hides the directories "/boot", "/sbin", "/proc" and "/sys" unless
-# the "show_hidden" option is activated.
-
-# Save the original filter function
-import ranger.container.directory
-old_accept_file = ranger.container.directory.accept_file
-
-HIDE_FILES = ("/boot", "/sbin", "/proc", "/sys")
-
-# Define a new one
-def custom_accept_file(file, filters):
-    if not file.fm.settings.show_hidden and file.path in HIDE_FILES:
-        return False
-    else:
-        return old_accept_file(file, filters)
-
-# Overwrite the old function
-import ranger.container.directory
-ranger.container.directory.accept_file = custom_accept_file
diff --git a/doc/examples/plugin_hello_world.py b/doc/examples/plugin_hello_world.py
deleted file mode 100644
index a803e21b..00000000
--- a/doc/examples/plugin_hello_world.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compatible with ranger 1.6.*
-#
-# This is a sample plugin that displays "Hello World" in ranger's console after
-# it started.
-
-# We are going to extend the hook "ranger.api.hook_ready", so first we need
-# to import ranger.api:
-import ranger.api
-
-# Save the previously existing hook, because maybe another module already
-# extended that hook and we don't want to lose it:
-old_hook_ready = ranger.api.hook_ready
-
-# Create a replacement for the hook that...
-def hook_ready(fm):
-    # ...does the desired action...
-    fm.notify("Hello World")
-    # ...and calls the saved hook.  If you don't care about the return value,
-    # simply return the return value of the previous hook to be safe.
-    return old_hook_ready(fm)
-
-# Finally, "monkey patch" the existing hook_ready function with our replacement:
-ranger.api.hook_ready = hook_ready
diff --git a/doc/examples/plugin_new_macro.py b/doc/examples/plugin_new_macro.py
deleted file mode 100644
index 159a92f2..00000000
--- a/doc/examples/plugin_new_macro.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Compatible with ranger 1.6.*
-#
-# This plugin adds the new macro %date which is substituted with the current
-# date in commands that allow macros.  You can test it with the command
-# ":shell echo %date; read"
-
-# Save the original macro function
-import ranger.core.actions
-old_get_macros = ranger.core.actions.Actions._get_macros
-
-# Define a new macro function
-import time
-def get_macros_with_date(self):
-       macros = old_get_macros(self)
-       macros['date'] = time.strftime('%m/%d/%Y')
-       return macros
-
-# Overwrite the old one
-ranger.core.actions.Actions._get_macros = get_macros_with_date
diff --git a/doc/examples/plugin_new_sorting_method.py b/doc/examples/plugin_new_sorting_method.py
deleted file mode 100644
index 6b41b0e1..00000000
--- a/doc/examples/plugin_new_sorting_method.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Compatible with ranger 1.6.*
-#
-# This plugin adds the sorting algorithm called 'random'.  To enable it, type
-# ":set sort=random" or create a key binding with ":map oz set sort=random"
-
-from ranger.container.directory import Directory
-from random import random
-Directory.sort_dict['random'] = lambda path: random()
-
diff --git a/doc/examples/rifle_different_file_opener.conf b/doc/examples/rifle_different_file_opener.conf
deleted file mode 100644
index 4a8250b8..00000000
--- a/doc/examples/rifle_different_file_opener.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Compatible with ranger 1.6.*
-#
-# Replace your rifle.conf with this file to use xdg-open as your file opener.
-# This is, of course, adaptable for use with any other file opener.
-else = xdg-open "$1"
-
-# You need an "editor" and "pager" in order to use certain functions in ranger:
-label editor = "$EDITOR" -- "$@"
-label pager  = "$PAGER" -- "$@"
diff --git a/doc/examples/rifle_sxiv.sh b/doc/examples/rifle_sxiv.sh
deleted file mode 100755
index 6307f1c2..00000000
--- a/doc/examples/rifle_sxiv.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Compatible with ranger 1.6.*
-#
-# This script searches image files in a directory, opens them all with sxiv and
-# sets the first argument to the first image displayed by sxiv.
-#
-# This is supposed to be used in rifle.conf as a workaround for the fact that
-# sxiv takes no file name arguments for the first image, just the number.  Copy
-# this file somewhere into your $PATH and add this at the top of rifle.conf:
-#
-#   mime ^image, has sxiv, X, flag f = path/to/this/script -- "$@"
-#
-# Implementation notes: this script is quite slow because of POSIX limitations
-# and portability concerns. First calling the shell function 'abspath' is
-# quicker than calling 'realpath' because it would fork a whole process, which
-# is slow. Second, we need to append a file list to sxiv, which can only be done
-# properly in two ways: arrays (which are not POSIX) or \0 sperated
-# strings. Unfortunately, assigning \0 to a variable is not POSIX either (will
-# not work in dash and others), so we cannot store the result of listfiles to a
-# variable.
-
-if [ $# -eq 0 ]; then
-    echo "Usage: ${0##*/} PICTURES"
-    exit
-fi
-
-[ "$1" == '--' ] && shift
-
-abspath () {
-    case "$1" in
-        /*) printf "%s\n" "$1";;
-        *)  printf "%s\n" "$PWD/$1";;
-    esac
-}
-
-listfiles () {
-    find -L "$(dirname "$target")" -maxdepth 1 -type f -iregex \
-      '.*\(jpe?g\|bmp\|png\|gif\)$' -print0 | sort -z
-}
-
-target="$(abspath "$1")"
-count="$(listfiles | grep -m 1 -ZznF "$target" | cut -d: -f1)"
-
-if [ -n "$count" ]; then
-    listfiles | xargs -0 sxiv -n "$count" --
-else
-    sxiv -- "$@" # fallback
-fi
diff --git a/doc/examples/vim_file_chooser.vim b/doc/examples/vim_file_chooser.vim
deleted file mode 100644
index aa3af763..00000000
--- a/doc/examples/vim_file_chooser.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-" Compatible with ranger 1.4.2 through 1.6.*
-"
-" Add ranger as a file chooser in vim
-"
-" If you add this code to the .vimrc, ranger can be started using the command
-" ":RangerChooser" or the keybinding "<leader>r".  Once you select one or more
-" files, press enter and ranger will quit again and vim will open the selected
-" files.
-
-function! RangeChooser()
-    let temp = tempname()
-    " The option "--choosefiles" was added in ranger 1.5.1. Use the next line
-    " with ranger 1.4.2 through 1.5.0 instead.
-    "exec 'silent !ranger --choosefile=' . shellescape(temp)
-    exec 'silent !ranger --choosefiles=' . shellescape(temp)
-    if !filereadable(temp)
-        redraw!
-        " Nothing to read.
-        return
-    endif
-    let names = readfile(temp)
-    if empty(names)
-        redraw!
-        " Nothing to open.
-        return
-    endif
-    " Edit the first item.
-    exec 'edit ' . fnameescape(names[0])
-    " Add any remaning items to the arg list/buffer list.
-    for name in names[1:]
-        exec 'argadd ' . fnameescape(name)
-    endfor
-    redraw!
-endfunction
-command! -bar RangerChooser call RangeChooser()
-nnoremap <leader>r :<C-U>RangerChooser<CR>
diff --git a/doc/ranger.1 b/doc/ranger.1
index c4896b2e..461ee00e 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -166,7 +166,7 @@ The directory \fIdoc/configs\fR contains configuration files.  They are usually
 installed to \fI/usr/lib/python*/site\-packages/ranger/config\fR and can be
 obtained with ranger's \-\-copy\-config option.
 .PP
-The directory \fIdoc/examples\fR contains reference implementations for ranger
+The directory \fIexamples\fR contains reference implementations for ranger
 plugins, sample configuration files and some programs for integrating ranger
 with other software.  They are usually installed to
 \&\fI/usr/lib/python*/site\-packages/ranger/examples\fR.
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 5c150d7a..ab6dc6d2 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -39,7 +39,7 @@ The directory F<doc/configs> contains configuration files.  They are usually
 installed to F</usr/lib/python*/site-packages/ranger/config> and can be
 obtained with ranger's --copy-config option.
 
-The directory F<doc/examples> contains reference implementations for ranger
+The directory F<examples> contains reference implementations for ranger
 plugins, sample configuration files and some programs for integrating ranger
 with other software.  They are usually installed to
 F</usr/lib/python*/site-packages/ranger/examples>.
diff --git a/examples/README b/examples/README
new file mode 100644
index 00000000..ca514853
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,8 @@
+The files in this directory contain applications or extensions of ranger which
+are put here for your inspiration and as references.
+
+In order to use a plugin from this directory, you need to copy it to
+~/.config/ranger/plugins/
+
+Note that if you update ranger to a new minor version (for example,
+from 1.6.* to 1.7.0), your outdated plugins WILL break and crash ranger.
diff --git a/examples/bash_automatic_cd.sh b/examples/bash_automatic_cd.sh
new file mode 100644
index 00000000..465c9c80
--- /dev/null
+++ b/examples/bash_automatic_cd.sh
@@ -0,0 +1,21 @@
+# Compatible with ranger 1.4.2 through 1.6.*
+#
+# Automatically change the directory in bash after closing ranger
+#
+# This is a bash function for .bashrc to automatically change the directory to
+# the last visited one after ranger quits.
+# To undo the effect of this function, you can type "cd -" to return to the
+# original directory.
+
+function ranger-cd {
+    tempfile="$(mktemp)"
+    /usr/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}"
+    test -f "$tempfile" &&
+    if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
+        cd -- "$(cat "$tempfile")"
+    fi
+    rm -f -- "$tempfile"
+}
+
+# This binds Ctrl-O to ranger-cd:
+bind '"\C-o":"ranger-cd\C-m"'
diff --git a/examples/bash_subshell_notice.sh b/examples/bash_subshell_notice.sh
new file mode 100644
index 00000000..bc44d5a8
--- /dev/null
+++ b/examples/bash_subshell_notice.sh
@@ -0,0 +1,7 @@
+# Compatible with ranger 1.5.3 through 1.6.*
+#
+# Change the prompt when you open a shell from inside ranger
+#
+# Add this line to your .bashrc for it to work.
+
+[ -n "$RANGER_LEVEL" ] && PS1="$PS1"'(in ranger) '
diff --git a/examples/plugin_chmod_keybindings.py b/examples/plugin_chmod_keybindings.py
new file mode 100644
index 00000000..0ab975ed
--- /dev/null
+++ b/examples/plugin_chmod_keybindings.py
@@ -0,0 +1,20 @@
+# Compatible with ranger 1.6.*
+#
+# This plugin serves as an example for adding key bindings through a plugin.
+# It could replace the ten lines in the rc.conf that create the key bindings
+# for the "chmod" command.
+
+import ranger.api
+old_hook_init = ranger.api.hook_init
+
+def hook_init(fm):
+    old_hook_init(fm)
+
+    # Generate key bindings for the chmod command
+    command = "map {0}{1}{2} shell -d chmod {1}{0}{2} %s"
+    for mode in list('ugoa') + ['']:
+        for perm in "rwxXst":
+            fm.execute_console(command.format('-', mode, perm))
+            fm.execute_console(command.format('+', mode, perm))
+
+ranger.api.hook_init = hook_init
diff --git a/examples/plugin_file_filter.py b/examples/plugin_file_filter.py
new file mode 100644
index 00000000..b9bea1f3
--- /dev/null
+++ b/examples/plugin_file_filter.py
@@ -0,0 +1,21 @@
+# Compatible since ranger 1.6.1, git commit c82a8a76989c
+#
+# This plugin hides the directories "/boot", "/sbin", "/proc" and "/sys" unless
+# the "show_hidden" option is activated.
+
+# Save the original filter function
+import ranger.container.directory
+old_accept_file = ranger.container.directory.accept_file
+
+HIDE_FILES = ("/boot", "/sbin", "/proc", "/sys")
+
+# Define a new one
+def custom_accept_file(file, filters):
+    if not file.fm.settings.show_hidden and file.path in HIDE_FILES:
+        return False
+    else:
+        return old_accept_file(file, filters)
+
+# Overwrite the old function
+import ranger.container.directory
+ranger.container.directory.accept_file = custom_accept_file
diff --git a/examples/plugin_hello_world.py b/examples/plugin_hello_world.py
new file mode 100644
index 00000000..a803e21b
--- /dev/null
+++ b/examples/plugin_hello_world.py
@@ -0,0 +1,23 @@
+# Compatible with ranger 1.6.*
+#
+# This is a sample plugin that displays "Hello World" in ranger's console after
+# it started.
+
+# We are going to extend the hook "ranger.api.hook_ready", so first we need
+# to import ranger.api:
+import ranger.api
+
+# Save the previously existing hook, because maybe another module already
+# extended that hook and we don't want to lose it:
+old_hook_ready = ranger.api.hook_ready
+
+# Create a replacement for the hook that...
+def hook_ready(fm):
+    # ...does the desired action...
+    fm.notify("Hello World")
+    # ...and calls the saved hook.  If you don't care about the return value,
+    # simply return the return value of the previous hook to be safe.
+    return old_hook_ready(fm)
+
+# Finally, "monkey patch" the existing hook_ready function with our replacement:
+ranger.api.hook_ready = hook_ready
diff --git a/examples/plugin_new_macro.py b/examples/plugin_new_macro.py
new file mode 100644
index 00000000..159a92f2
--- /dev/null
+++ b/examples/plugin_new_macro.py
@@ -0,0 +1,19 @@
+# Compatible with ranger 1.6.*
+#
+# This plugin adds the new macro %date which is substituted with the current
+# date in commands that allow macros.  You can test it with the command
+# ":shell echo %date; read"
+
+# Save the original macro function
+import ranger.core.actions
+old_get_macros = ranger.core.actions.Actions._get_macros
+
+# Define a new macro function
+import time
+def get_macros_with_date(self):
+       macros = old_get_macros(self)
+       macros['date'] = time.strftime('%m/%d/%Y')
+       return macros
+
+# Overwrite the old one
+ranger.core.actions.Actions._get_macros = get_macros_with_date
diff --git a/examples/plugin_new_sorting_method.py b/examples/plugin_new_sorting_method.py
new file mode 100644
index 00000000..6b41b0e1
--- /dev/null
+++ b/examples/plugin_new_sorting_method.py
@@ -0,0 +1,9 @@
+# Compatible with ranger 1.6.*
+#
+# This plugin adds the sorting algorithm called 'random'.  To enable it, type
+# ":set sort=random" or create a key binding with ":map oz set sort=random"
+
+from ranger.container.directory import Directory
+from random import random
+Directory.sort_dict['random'] = lambda path: random()
+
diff --git a/examples/rifle_different_file_opener.conf b/examples/rifle_different_file_opener.conf
new file mode 100644
index 00000000..4a8250b8
--- /dev/null
+++ b/examples/rifle_different_file_opener.conf
@@ -0,0 +1,9 @@
+# Compatible with ranger 1.6.*
+#
+# Replace your rifle.conf with this file to use xdg-open as your file opener.
+# This is, of course, adaptable for use with any other file opener.
+else = xdg-open "$1"
+
+# You need an "editor" and "pager" in order to use certain functions in ranger:
+label editor = "$EDITOR" -- "$@"
+label pager  = "$PAGER" -- "$@"
diff --git a/examples/rifle_sxiv.sh b/examples/rifle_sxiv.sh
new file mode 100755
index 00000000..6307f1c2
--- /dev/null
+++ b/examples/rifle_sxiv.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Compatible with ranger 1.6.*
+#
+# This script searches image files in a directory, opens them all with sxiv and
+# sets the first argument to the first image displayed by sxiv.
+#
+# This is supposed to be used in rifle.conf as a workaround for the fact that
+# sxiv takes no file name arguments for the first image, just the number.  Copy
+# this file somewhere into your $PATH and add this at the top of rifle.conf:
+#
+#   mime ^image, has sxiv, X, flag f = path/to/this/script -- "$@"
+#
+# Implementation notes: this script is quite slow because of POSIX limitations
+# and portability concerns. First calling the shell function 'abspath' is
+# quicker than calling 'realpath' because it would fork a whole process, which
+# is slow. Second, we need to append a file list to sxiv, which can only be done
+# properly in two ways: arrays (which are not POSIX) or \0 sperated
+# strings. Unfortunately, assigning \0 to a variable is not POSIX either (will
+# not work in dash and others), so we cannot store the result of listfiles to a
+# variable.
+
+if [ $# -eq 0 ]; then
+    echo "Usage: ${0##*/} PICTURES"
+    exit
+fi
+
+[ "$1" == '--' ] && shift
+
+abspath () {
+    case "$1" in
+        /*) printf "%s\n" "$1";;
+        *)  printf "%s\n" "$PWD/$1";;
+    esac
+}
+
+listfiles () {
+    find -L "$(dirname "$target")" -maxdepth 1 -type f -iregex \
+      '.*\(jpe?g\|bmp\|png\|gif\)$' -print0 | sort -z
+}
+
+target="$(abspath "$1")"
+count="$(listfiles | grep -m 1 -ZznF "$target" | cut -d: -f1)"
+
+if [ -n "$count" ]; then
+    listfiles | xargs -0 sxiv -n "$count" --
+else
+    sxiv -- "$@" # fallback
+fi
diff --git a/examples/vim_file_chooser.vim b/examples/vim_file_chooser.vim
new file mode 100644
index 00000000..aa3af763
--- /dev/null
+++ b/examples/vim_file_chooser.vim
@@ -0,0 +1,36 @@
+" Compatible with ranger 1.4.2 through 1.6.*
+"
+" Add ranger as a file chooser in vim
+"
+" If you add this code to the .vimrc, ranger can be started using the command
+" ":RangerChooser" or the keybinding "<leader>r".  Once you select one or more
+" files, press enter and ranger will quit again and vim will open the selected
+" files.
+
+function! RangeChooser()
+    let temp = tempname()
+    " The option "--choosefiles" was added in ranger 1.5.1. Use the next line
+    " with ranger 1.4.2 through 1.5.0 instead.
+    "exec 'silent !ranger --choosefile=' . shellescape(temp)
+    exec 'silent !ranger --choosefiles=' . shellescape(temp)
+    if !filereadable(temp)
+        redraw!
+        " Nothing to read.
+        return
+    endif
+    let names = readfile(temp)
+    if empty(names)
+        redraw!
+        " Nothing to open.
+        return
+    endif
+    " Edit the first item.
+    exec 'edit ' . fnameescape(names[0])
+    " Add any remaning items to the arg list/buffer list.
+    for name in names[1:]
+        exec 'argadd ' . fnameescape(name)
+    endfor
+    redraw!
+endfunction
+command! -bar RangerChooser call RangeChooser()
+nnoremap <leader>r :<C-U>RangerChooser<CR>
diff --git a/setup.py b/setup.py
index c646f3fb..1e074f8d 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ if __name__ == '__main__':
                 _findall('doc/config/colorschemes')),
             ('share/doc/ranger/config', _findall('doc/config')),
             ('share/doc/ranger/tools', _findall('doc/tools')),
-            ('share/doc/ranger/examples', _findall('doc/examples')),
+            ('share/doc/ranger/examples', _findall('examples')),
         ],
         package_data={'ranger': ['data/*', 'config/rc.conf',
             'config/rifle.conf']},
-- 
cgit 1.4.1-2-gfad0


From 3212bd8b3a154b8b11296cd581c9edc9ce741175 Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Mon, 13 Apr 2015 12:57:33 +0200
Subject: doc/ranger.1: fix paths in RESOURCES section

---
 doc/ranger.1   | 6 +++---
 doc/ranger.pod | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/ranger.1 b/doc/ranger.1
index 461ee00e..17795a7c 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -163,13 +163,13 @@ The \fI\s-1README\s0\fR contains install instructions.
 The file \fI\s-1HACKING\s0.md\fR contains guidelines for code modification.
 .PP
 The directory \fIdoc/configs\fR contains configuration files.  They are usually
-installed to \fI/usr/lib/python*/site\-packages/ranger/config\fR and can be
-obtained with ranger's \-\-copy\-config option.
+installed to \fI/usr/share/doc/ranger/config\fR and can be obtained with ranger's
+\&\-\-copy\-config option.
 .PP
 The directory \fIexamples\fR contains reference implementations for ranger
 plugins, sample configuration files and some programs for integrating ranger
 with other software.  They are usually installed to
-\&\fI/usr/lib/python*/site\-packages/ranger/examples\fR.
+\&\fI/usr/share/doc/ranger/examples\fR.
 .PP
 The man page of \fIrifle\fR\|(1) describes the functions of the file opener
 .PP
diff --git a/doc/ranger.pod b/doc/ranger.pod
index ab6dc6d2..ab84de2c 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -36,13 +36,13 @@ The F<README> contains install instructions.
 The file F<HACKING.md> contains guidelines for code modification.
 
 The directory F<doc/configs> contains configuration files.  They are usually
-installed to F</usr/lib/python*/site-packages/ranger/config> and can be
-obtained with ranger's --copy-config option.
+installed to F</usr/share/doc/ranger/config> and can be obtained with ranger's
+--copy-config option.
 
 The directory F<examples> contains reference implementations for ranger
 plugins, sample configuration files and some programs for integrating ranger
 with other software.  They are usually installed to
-F</usr/lib/python*/site-packages/ranger/examples>.
+F</usr/share/doc/ranger/examples>.
 
 The man page of rifle(1) describes the functions of the file opener
 
-- 
cgit 1.4.1-2-gfad0


From 89146651e07830f15b59b5f076d61741747a0bea Mon Sep 17 00:00:00 2001
From: hut <hut@lepus.uberspace.de>
Date: Tue, 14 Apr 2015 00:25:24 +0200
Subject: Should I dual ranger/cleric or wait for the THAC0 bonus?

Squashed commit of the following:

commit 7236dde27bf33fec5097c223f0d70598b10ba05f
Author: hut <hut@lepus.uberspace.de>
Date:   Mon Apr 13 14:33:59 2015 +0200

    wrote changelog entry

commit 73e76b0f9a22ad8122154c4a2763c27ebce9be37
Author: hut <hut@lepus.uberspace.de>
Date:   Mon Apr 13 13:41:27 2015 +0200

    update version number in man page

commit b1948b9382027ed55d095a936610bc62f7cdba9a
Author: hut <hut@lepus.uberspace.de>
Date:   Mon Apr 13 13:41:08 2015 +0200

    update rifle version number

commit a96a8a808a3c68eb848a3e0361fd95cb8c643d59
Author: hut <hut@lepus.uberspace.de>
Date:   Mon Apr 13 13:34:59 2015 +0200

    s/ranger-master/ranger-stable/

commit 6967a48193227b4a0c843e8831e5511005179f69
Author: hut <hut@lepus.uberspace.de>
Date:   Mon Apr 13 13:33:06 2015 +0200

    updated version number

commit 0cbc401fd25fc4d307d026628e12ef1106a42bdf
Author: hut <hut@lepus.uberspace.de>
Date:   Mon Apr 13 13:18:26 2015 +0200

    updated version info in example plugins
---
 CHANGELOG                                 | 24 ++++++++++++++++++++++++
 README.md                                 |  2 +-
 doc/ranger.1                              |  2 +-
 doc/rifle.1                               |  2 +-
 examples/bash_automatic_cd.sh             |  2 +-
 examples/bash_subshell_notice.sh          |  2 +-
 examples/plugin_chmod_keybindings.py      |  2 +-
 examples/plugin_file_filter.py            |  2 +-
 examples/plugin_hello_world.py            |  2 +-
 examples/plugin_new_macro.py              |  2 +-
 examples/plugin_new_sorting_method.py     |  2 +-
 examples/rifle_different_file_opener.conf |  2 +-
 examples/rifle_sxiv.sh                    |  2 +-
 examples/vim_file_chooser.vim             |  2 +-
 ranger/__init__.py                        |  4 ++--
 ranger/ext/rifle.py                       |  2 +-
 16 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'doc')

diff --git a/CHANGELOG b/CHANGELOG
index c5237279..041a7701 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,29 @@
 This log documents changes between stable versions.
 
+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
+  iTerm2 image previews
+* Added ":rename_append" command to rename files without the file extension
+* Added ":linemode" command to change the way the files are displayed
+  Try this out by pressing M followed by one of the suggested keys.
+  New linemodes can be added with ranger.api.register_linemode().
+* Added ":filter_by_inode" command to only show directories, files or links
+* Added ":meta" command for managing custom file metadata
+* Added ":flat" command for displaying subdirectories
+* Added "solarized" colorscheme
+* Added generic ability to use scope.sh for image previews
+* Added video previews in scope.sh
+* Added option "sort_unicode" to sort according to unicode, not ASCII
+* ":mkdir" can now create multiple directory levels (like `mkdir -p`)
+* ":help" (key binding "?") is now interactive
+* ":find" (key binding "/") is now case insensitive by default
+* "ranger --copy-config=all" now copies a short sample commands.py rather than
+  the full one, so that you can update ranger without having broken commands.
+  The full commands.py is still copied to ~/.config/ranger/commands_full.py.
+* 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
diff --git a/README.md b/README.md
index a2026084..b5e42455 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-ranger v.1.6.1
+ranger v.1.7.0
 ==============
 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 17795a7c..e7f64add 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.6.1" "04/13/2015" "ranger manual"
+.TH RANGER 1 "ranger-1.7.0" "04/13/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 21c53276..95010452 100644
--- a/doc/rifle.1
+++ b/doc/rifle.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RIFLE 1"
-.TH RIFLE 1 "rifle-1.6.1" "04/10/2015" "rifle manual"
+.TH RIFLE 1 "rifle-1.7.0" "04/13/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/examples/bash_automatic_cd.sh b/examples/bash_automatic_cd.sh
index 465c9c80..ac96ea12 100644
--- a/examples/bash_automatic_cd.sh
+++ b/examples/bash_automatic_cd.sh
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.4.2 through 1.6.*
+# Compatible with ranger 1.4.2 through 1.7.*
 #
 # Automatically change the directory in bash after closing ranger
 #
diff --git a/examples/bash_subshell_notice.sh b/examples/bash_subshell_notice.sh
index bc44d5a8..4c9269c4 100644
--- a/examples/bash_subshell_notice.sh
+++ b/examples/bash_subshell_notice.sh
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.5.3 through 1.6.*
+# Compatible with ranger 1.5.3 through 1.7.*
 #
 # Change the prompt when you open a shell from inside ranger
 #
diff --git a/examples/plugin_chmod_keybindings.py b/examples/plugin_chmod_keybindings.py
index 0ab975ed..1c9558f7 100644
--- a/examples/plugin_chmod_keybindings.py
+++ b/examples/plugin_chmod_keybindings.py
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.6.*
+# Compatible with ranger 1.6.0 through ranger 1.7.*
 #
 # This plugin serves as an example for adding key bindings through a plugin.
 # It could replace the ten lines in the rc.conf that create the key bindings
diff --git a/examples/plugin_file_filter.py b/examples/plugin_file_filter.py
index b9bea1f3..d5ea2d2d 100644
--- a/examples/plugin_file_filter.py
+++ b/examples/plugin_file_filter.py
@@ -1,4 +1,4 @@
-# Compatible since ranger 1.6.1, git commit c82a8a76989c
+# Compatible since ranger 1.7.0 (git commit c82a8a76989c)
 #
 # This plugin hides the directories "/boot", "/sbin", "/proc" and "/sys" unless
 # the "show_hidden" option is activated.
diff --git a/examples/plugin_hello_world.py b/examples/plugin_hello_world.py
index a803e21b..b64916d4 100644
--- a/examples/plugin_hello_world.py
+++ b/examples/plugin_hello_world.py
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.6.*
+# Compatible with ranger 1.6.0 through 1.7.*
 #
 # This is a sample plugin that displays "Hello World" in ranger's console after
 # it started.
diff --git a/examples/plugin_new_macro.py b/examples/plugin_new_macro.py
index 159a92f2..6757e491 100644
--- a/examples/plugin_new_macro.py
+++ b/examples/plugin_new_macro.py
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.6.*
+# Compatible with ranger 1.6.0 through 1.7.*
 #
 # This plugin adds the new macro %date which is substituted with the current
 # date in commands that allow macros.  You can test it with the command
diff --git a/examples/plugin_new_sorting_method.py b/examples/plugin_new_sorting_method.py
index 6b41b0e1..c6e35a68 100644
--- a/examples/plugin_new_sorting_method.py
+++ b/examples/plugin_new_sorting_method.py
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.6.*
+# Compatible with ranger 1.6.0 through 1.7.*
 #
 # This plugin adds the sorting algorithm called 'random'.  To enable it, type
 # ":set sort=random" or create a key binding with ":map oz set sort=random"
diff --git a/examples/rifle_different_file_opener.conf b/examples/rifle_different_file_opener.conf
index 4a8250b8..695f27c6 100644
--- a/examples/rifle_different_file_opener.conf
+++ b/examples/rifle_different_file_opener.conf
@@ -1,4 +1,4 @@
-# Compatible with ranger 1.6.*
+# Compatible with ranger 1.6.0 through 1.7.*
 #
 # Replace your rifle.conf with this file to use xdg-open as your file opener.
 # This is, of course, adaptable for use with any other file opener.
diff --git a/examples/rifle_sxiv.sh b/examples/rifle_sxiv.sh
index 6307f1c2..8cb13907 100755
--- a/examples/rifle_sxiv.sh
+++ b/examples/rifle_sxiv.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Compatible with ranger 1.6.*
+# Compatible with ranger 1.6.0 through 1.7.*
 #
 # This script searches image files in a directory, opens them all with sxiv and
 # sets the first argument to the first image displayed by sxiv.
diff --git a/examples/vim_file_chooser.vim b/examples/vim_file_chooser.vim
index aa3af763..fb9b7e1b 100644
--- a/examples/vim_file_chooser.vim
+++ b/examples/vim_file_chooser.vim
@@ -1,4 +1,4 @@
-" Compatible with ranger 1.4.2 through 1.6.*
+" Compatible with ranger 1.4.2 through 1.7.*
 "
 " Add ranger as a file chooser in vim
 "
diff --git a/ranger/__init__.py b/ranger/__init__.py
index b850f455..fa9ba033 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -13,7 +13,7 @@ import os
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.6.1'
+__version__ = '1.7.0'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@hut.pm'
 
@@ -27,7 +27,7 @@ DEFAULT_PAGER = 'less'
 LOGFILE = '/tmp/ranger_errorlog'
 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
 # and the configuration directory will be $XDG_CONFIG_HOME/ranger instead.
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index 640cb382..3f360968 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.6.1'
+__version__ = 'rifle 1.7.0'
 
 # Options and constants that a user might want to change:
 DEFAULT_PAGER = 'less'
-- 
cgit 1.4.1-2-gfad0