summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authortoonn <toonn@toonn.io>2019-05-20 20:04:00 +0200
committertoonn <toonn@toonn.io>2019-05-20 20:04:00 +0200
commit7451a0afdd00f0094d4274c43cb2c9dad25f50ce (patch)
tree873d05e1c8b4a4e4b75d7bd0f3b306260ac179fa /ranger
parent0cf33f2f7256429c616917c370675cc39091b35a (diff)
parentc5da4108e3ead93d0a425d6bcd5f645389229dc7 (diff)
downloadranger-7451a0afdd00f0094d4274c43cb2c9dad25f50ce.tar.gz
Merge branch 'flexible_highlight'
Diffstat (limited to 'ranger')
-rwxr-xr-xranger/data/scope.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ranger/data/scope.sh b/ranger/data/scope.sh
index ba9edc50..e9c10916 100755
--- a/ranger/data/scope.sh
+++ b/ranger/data/scope.sh
@@ -35,9 +35,9 @@ FILE_EXTENSION_LOWER="$(printf "%s" "${FILE_EXTENSION}" | tr '[:upper:]' '[:lowe
 
 # Settings
 HIGHLIGHT_SIZE_MAX=262143  # 256KiB
-HIGHLIGHT_TABWIDTH=8
+HIGHLIGHT_TABWIDTH=${HIGHLIGHT_TABWIDTH:-8}
 HIGHLIGHT_STYLE=${HIGHLIGHT_STYLE:-pablo}
-HIGHLIGHT_OPTIONS="--style=${HIGHLIGHT_STYLE} ${HIGHLIGHT_OPTIONS:-}"
+HIGHLIGHT_OPTIONS="--replace-tabs=${HIGHLIGHT_TABWIDTH} --style=${HIGHLIGHT_STYLE} ${HIGHLIGHT_OPTIONS:-}"
 PYGMENTIZE_STYLE=${PYGMENTIZE_STYLE:-autumn}
 
 
@@ -229,7 +229,7 @@ handle_mime() {
                 local pygmentize_format='terminal'
                 local highlight_format='ansi'
             fi
-            env HIGHLIGHT_OPTIONS="${HIGHLIGHT_OPTIONS}" highlight --replace-tabs="${HIGHLIGHT_TABWIDTH}" \
+            env HIGHLIGHT_OPTIONS="${HIGHLIGHT_OPTIONS}" highlight \
                 --out-format="${highlight_format}" \
                 --force -- "${FILE_PATH}" && exit 5
             pygmentize -f "${pygmentize_format}" -O "style=${PYGMENTIZE_STYLE}"\