MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-16 18:22:28 +01:00
Code Issues Releases Wiki Activity

Do not pass '--no-init' on newer less versions

Browse Source 
With this change, we do not pass the `--no-init` option in newer
versions of less (530 or higher).

This fixes #749
This commit is contained in:
sharkdp
2019-12-23 09:54:18 +01:00
committed by David Peter
parent 126729f87a
commit 67fe804256
3 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/output.rs
View File

@@ -7,6 +7,7 @@ use std::process::{Child, Command, Stdio};
use shell_words;
use crate::errors::*;
use crate::less::retrieve_less_version;
use crate::PagingMode;
#[derive(Debug)]
@@ -70,10 +71,21 @@ impl OutputType {
let mut process = if is_less {
let mut p = Command::new(&pager_path);
if args.is_empty() || replace_arguments_to_less {
p.args(vec!["--RAW-CONTROL-CHARS", "--no-init"]);
p.arg("--RAW-CONTROL-CHARS");
if quit_if_one_screen {
p.arg("--quit-if-one-screen");
}
// Passing '--no-init' fixes a bug with '--quit-if-one-screen' in older
// versions of 'less'. Unfortunately, it also breaks mouse-wheel support.
//
// See: http://www.greenwoodsoftware.com/less/news.530.html
match retrieve_less_version() {
Some(version) if version < 530 => {
p.arg("--no-init");
}
_ => {}
}
} else {
p.args(args);
}