@@ -98,20 +98,18 @@ pub(crate) fn get_pager(config_pager: Option<&str>) -> Result<Option<Pager>, Par
98 Some((bin, args)) => {
98 Some((bin, args)) => {
99 let kind = PagerKind::from_bin(bin);
99 let kind = PagerKind::from_bin(bin);
101− let use_less_instead = match source {
101+ let use_less_instead = match (&source, &kind) {
102− PagerSource::EnvVarPager => {
103− // 'more' and 'most' do not supports colors; automatically use 'less' instead
102+ // 'more' and 'most' do not supports colors; automatically use 'less' instead
104− // if the problematic pager came from the generic PAGER env var
103+ // if the problematic pager came from the generic PAGER env var
105− let no_color_support = kind == PagerKind::More || kind == PagerKind::Most;
104+ (PagerSource::EnvVarPager, PagerKind::More) => true,
106−
105+ (PagerSource::EnvVarPager, PagerKind::Most) => true,
107− // If PAGER=bat, silently use 'less' instead to prevent recursion ...
107+ // If PAGER=bat, silently use 'less' instead to prevent recursion ...
108− let is_self = kind == PagerKind::Bat;
108+ (PagerSource::EnvVarPager, PagerKind::Bat) => true,
110− no_color_support || is_self
112− // Never silently replace with less if bat-specific means to set a pager is used
110+ // Never silently use less if BAT_PAGER or --pager has been specified
113− _ => false
111+ _ => false,
116 Ok(Some(if use_less_instead {
114 Ok(Some(if use_less_instead {
117 let no_args = vec![];
115 let no_args = vec![];