MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-17 02:32:26 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix-1063

Browse Source
This commit is contained in:
Martin Nordholts
2021-01-10 11:56:03 +01:00
parent da10166625 e3b1142364
commit 02e6ff4183
22 changed files with 323 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output.rs
View File

@@ -81,7 +81,7 @@ impl OutputType {
p.arg("--quit-if-one-screen");
}
if wrapping_mode == WrappingMode::NoWrapping {
if wrapping_mode == WrappingMode::NoWrapping(true) {
p.arg("--chop-long-lines");
}
@@ -121,11 +121,7 @@ impl OutputType {
#[cfg(feature = "paging")]
pub(crate) fn is_pager(&self) -> bool {
if let OutputType::Pager(_) = self {
true
} else {
false
}
matches!(self, OutputType::Pager(_))
}
#[cfg(not(feature = "paging"))]