===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- mandoc/main.c	2015/10/06 18:32:19	1.245
+++ mandoc/main.c	2015/10/10 13:21:18	1.246
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.245 2015/10/06 18:32:19 schwarze Exp $ */
+/*	$Id: main.c,v 1.246 2015/10/10 13:21:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -289,6 +289,11 @@ main(int argc, char *argv[])
 		}
 	}
 
+	if (outmode == OUTMODE_FLN ||
+	    outmode == OUTMODE_LST ||
+	    !isatty(STDOUT_FILENO))
+		use_pager = 0;
+
 	/* Parse arguments. */
 
 	if (argc > 0) {
@@ -419,9 +424,6 @@ main(int argc, char *argv[])
 
 	if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
 		return (int)MANDOCLEVEL_BADARG;
-
-	if (use_pager && ! isatty(STDOUT_FILENO))
-		use_pager = 0;
 
 	curp.mchars = mchars_alloc();
 	curp.mp = mparse_alloc(options, curp.wlevel, mmsg,