@@ -364,22 +364,24 @@ impl App {
364364 let paging_mode = match self.matches.value_of("paging") {
365365 Some("always") => PagingMode::Always,
366366 Some("never") => PagingMode::Never,
367− Some("auto") | _ => if files.contains(&InputFile::StdIn) {
368− // If we are reading from stdin, only enable paging if we write to an
369− // interactive terminal and if we do not *read* from an interactive
370− // terminal.
371− if self.interactive_output && !atty::is(Stream::Stdin) {
372− PagingMode::QuitIfOneScreen
373− } else {
374− PagingMode::Never
375− }
376− } else {
377− if self.interactive_output {
378− PagingMode::QuitIfOneScreen
367+ Some("auto") | _ => {
368+ if files.contains(&InputFile::StdIn) {
369+ // If we are reading from stdin, only enable paging if we write to an
370+ // interactive terminal and if we do not *read* from an interactive
371+ // terminal.
372+ if self.interactive_output && !atty::is(Stream::Stdin) {
373+ PagingMode::QuitIfOneScreen
374+ } else {
375+ PagingMode::Never
376+ }
379377 } else {
380− PagingMode::Never
378+ if self.interactive_output {
379+ PagingMode::QuitIfOneScreen
380+ } else {
381+ PagingMode::Never
382+ }
381383 }
382− },
384+ }
383385 };
384386
385387 Ok(Config {
@@ -393,11 +395,13 @@ impl App {
393395 match self.matches.value_of("wrap") {
394396 Some("character") => OutputWrap::Character,
395397 Some("never") => OutputWrap::None,
396− Some("auto") | _ => if output_components.plain() {
397− OutputWrap::None
398− } else {
399− OutputWrap::Character
400− },
398+ Some("auto") | _ => {
399+ if output_components.plain() {
400+ OutputWrap::None
401+ } else {
402+ OutputWrap::Character
403+ }
404+ }
401405 }
402406 },
403407 colored_output: match self.matches.value_of("color") {
@@ -450,8 +454,10 @@ impl App {
450454 } else {
451455 InputFile::Ordinary(filename)
452456 }
453− }).collect()
454− }).unwrap_or_else(|| vec![InputFile::StdIn])
457+ })
458+ .collect()
459+ })
460+ .unwrap_or_else(|| vec![InputFile::StdIn])
455461 }
456462
457463 fn output_components(&self) -> Result<OutputComponents> {