From 68ea927c66e380fcf85a1b6a223d4f1a458d7561 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Tue, 28 Mar 2023 16:12:00 -0700
Subject: [PATCH] cli: move default ui.pager config to misc.toml

---
 src/config/misc.toml |  1 +
 src/ui.rs            | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/config/misc.toml b/src/config/misc.toml
index 7157d672f..437dd6e92 100644
--- a/src/config/misc.toml
+++ b/src/config/misc.toml
@@ -9,4 +9,5 @@ fetch = "origin"
 # Placeholder: added by user
 
 [ui]
+pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8" } }
 log-word-wrap = false
diff --git a/src/ui.rs b/src/ui.rs
index caef296e9..a220d6f7e 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -18,10 +18,9 @@ use std::str::FromStr;
 use std::{env, fmt, io, mem};
 
 use crossterm::tty::IsTty;
-use maplit::hashmap;
 
 use crate::cli_util::CommandError;
-use crate::config::{CommandNameAndArgs, NonEmptyCommandArgsVec};
+use crate::config::CommandNameAndArgs;
 use crate::formatter::{Formatter, FormatterFactory, LabeledWriter};
 
 pub struct Ui {
@@ -95,19 +94,7 @@ pub enum PaginationChoice {
 fn pager_setting(config: &config::Config) -> Result<CommandNameAndArgs, CommandError> {
     config
         .get::<CommandNameAndArgs>("ui.pager")
-        .or_else(|err| match err {
-            config::ConfigError::NotFound(_) => Ok(CommandNameAndArgs::Structured {
-                command: NonEmptyCommandArgsVec::try_from(vec![
-                    "less".to_string(),
-                    "-FRX".to_string(),
-                ])
-                .unwrap(),
-                env: hashmap! { "LESSCHARSET".to_string() => "utf-8".to_string() },
-            }),
-            err => Err(CommandError::ConfigError(format!(
-                "Invalid `ui.pager`: {err:?}"
-            ))),
-        })
+        .map_err(|err| CommandError::ConfigError(format!("Invalid `ui.pager`: {err:?}")))
 }
 
 impl Ui {