on master help sign in
Revert 9ed8db22c ('windows' pager process execution fix) based on PR feedback/owner request
99226b7Roy Ivy III
src/output.rs+2−11
@@ -74,18 +74,8 @@ impl OutputType {
74
74
75 let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
75 let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
76
76
77− #[cfg(windows)]
78− let (pager_path, args) = {
79− let p = std::env::var("ComSpec").unwrap_or_else(|_| "cmd".to_string());
80− let mut a = args.to_vec();
81− a.insert(0, pager_path.to_str().unwrap().to_string());
82− a.insert(0, "/d/c".to_string());
83− (p, a)
84− };
85−
86− let mut p = Command::new(&pager_path);
87−
88 let mut process = if is_less {
77 let mut process = if is_less {
78+ let mut p = Command::new(&pager_path);
89 if args.is_empty() || replace_arguments_to_less {
79 if args.is_empty() || replace_arguments_to_less {
90 p.arg("--RAW-CONTROL-CHARS");
80 p.arg("--RAW-CONTROL-CHARS");
91 if quit_if_one_screen {
81 if quit_if_one_screen {
@@ -116,6 +106,7 @@ impl OutputType {
116 p.env("LESSCHARSET", "UTF-8");
106 p.env("LESSCHARSET", "UTF-8");
117 p
107 p
118 } else {
108 } else {
109+ let mut p = Command::new(&pager_path);
119 p.args(args);
110 p.args(args);
120 p
111 p
121 };
112 };