merge setting "relative_line_numbers" into "line_numbers"

line_numbers now takes a string rather than a bool, with the valid
values "false", "absolute" and "relative".

Related to #546

2 files changed, 15 insertions, 14 deletions

diff --git a/doc/ranger.1 b/doc/ranger.1
index ecc4f7f1..b2ba1aac 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -735,9 +735,15 @@ this pattern will hide all files that start with a dot or end with a tilde.
 The delay that ranger idly waits for user input, in milliseconds, with a
 resolution of 100ms.  Lower delay reduces lag between directory updates but
 increases \s-1CPU\s0 load.
-.IP "line_numbers [bool]" 4
-.IX Item "line_numbers [bool]"
-Show line numbers in main column.
+.IP "line_numbers [string]" 4
+.IX Item "line_numbers [string]"
+Show line numbers in main column.  Possible values are:
+.Sp
+.Vb 3
+\& false      turn the feature off
+\& absolute   absolute line numbers for use with "<N>gg"
+\& relative   relative line numbers for "<N>k" or "<N>j"
+.Ve
 .IP "max_console_history_size [integer, none]" 4
 .IX Item "max_console_history_size [integer, none]"
 How many console commands should be kept in history?  \*(L"none\*(R" will disable the
@@ -776,10 +782,6 @@ to disable this feature.
 Which script should handle generating previews?  If the file doesn't exist, or
 use_preview_script is off, ranger will handle previews itself by just printing
 the content.
-.IP "relative_line_numbers [bool]" 4
-.IX Item "relative_line_numbers [bool]"
-Show relative line numbers in main column.  Requires \fBline_numbers\fR set to
-\&\fBtrue\fR.
 .IP "save_console_history [bool]" 4
 .IX Item "save_console_history [bool]"
 Should the console history be saved on exit?  If disabled, the console history
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 00c26f12..a69dc52d 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -720,9 +720,13 @@ The delay that ranger idly waits for user input, in milliseconds, with a
 resolution of 100ms.  Lower delay reduces lag between directory updates but
 increases CPU load.
 
-=item line_numbers [bool]
+=item line_numbers [string]
 
-Show line numbers in main column.
+Show line numbers in main column.  Possible values are:
+
+ false      turn the feature off
+ absolute   absolute line numbers for use with "<N>gg"
+ relative   relative line numbers for "<N>k" or "<N>j"
 
 =item max_console_history_size [integer, none]
 
@@ -772,11 +776,6 @@ Which script should handle generating previews?  If the file doesn't exist, or
 use_preview_script is off, ranger will handle previews itself by just printing
 the content.
 
-=item relative_line_numbers [bool]
-
-Show relative line numbers in main column.  Requires B<line_numbers> set to
-B<true>.
-
 =item save_console_history [bool]
 
 Should the console history be saved on exit?  If disabled, the console history