===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.209
retrieving revision 1.211
diff -u -p -r1.209 -r1.211
--- mandoc/main.c	2014/12/21 14:49:28	1.209
+++ mandoc/main.c	2015/01/01 13:20:38	1.211
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.209 2014/12/21 14:49:28 schwarze Exp $ */
+/*	$Id: main.c,v 1.211 2015/01/01 13:20:38 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -310,7 +310,8 @@ main(int argc, char *argv[])
 				argv = help_argv;
 				argc = 1;
 			}
-		} else if (((uc = argv[0]) != NULL) &&
+		} else if (argc > 1 &&
+		    ((uc = argv[0]) != NULL) &&
 		    ((isdigit(uc[0]) && (uc[1] == '\0' ||
 		      (isalpha(uc[1]) && uc[2] == '\0'))) ||
 		     (uc[0] == 'n' && uc[1] == '\0'))) {
@@ -447,7 +448,9 @@ main(int argc, char *argv[])
 
 		if (MANDOCLEVEL_OK != rc && curp.wstop)
 			break;
-		argc--;
+
+		if (--argc && curp.outtype <= OUTT_UTF8)
+			ascii_sepline(curp.outdata);
 	}
 
 	if (curp.outfree)
@@ -634,6 +637,8 @@ passthrough(const char *file, int fd, int synopsis_onl
 	size_t		 len, off;
 	ssize_t		 nw;
 	int		 print;
+
+	fflush(stdout);
 
 	if ((stream = fdopen(fd, "r")) == NULL) {
 		close(fd);