===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.144
retrieving revision 1.147
diff -u -p -r1.144 -r1.147
--- mandoc/read.c	2015/10/13 22:59:54	1.144
+++ mandoc/read.c	2016/01/08 02:13:39	1.147
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.144 2015/10/13 22:59:54 schwarze Exp $ */
+/*	$Id: read.c,v 1.147 2016/01/08 02:13:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,7 +26,9 @@
 
 #include <assert.h>
 #include <ctype.h>
+#if HAVE_ERR
 #include <err.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -215,6 +217,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	/* related to request and macro arguments */
 	"escaped character not allowed in a name",
 	"NOT IMPLEMENTED: Bd -file",
+	"skipping display without arguments",
 	"missing list type, using -item",
 	"missing manual name, using \"\"",
 	"uname(3) system call failed, using UNKNOWN",
@@ -539,6 +542,7 @@ rerun:
 			if (mparse_open(curp, &fd, ln.buf + of) ==
 			    MANDOCLEVEL_OK) {
 				mparse_readfd(curp, fd, ln.buf + of);
+				close(fd);
 				curp->file = save_file;
 			} else {
 				curp->file = save_file;
@@ -770,10 +774,6 @@ mparse_readfd(struct mparse *curp, int fd, const char 
 #endif
 			free(blk.buf);
 	}
-
-	if (fd != STDIN_FILENO && close(fd) == -1)
-		perror(file);
-
 	return curp->file_status;
 }