===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.150.2.2
retrieving revision 1.151
diff -u -p -r1.150.2.2 -r1.151
--- mandoc/read.c	2016/11/10 12:52:12	1.150.2.2
+++ mandoc/read.c	2016/07/19 21:31:55	1.151
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.150.2.2 2016/11/10 12:52:12 schwarze Exp $ */
+/*	$Id: read.c,v 1.151 2016/07/19 21:31:55 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -19,10 +19,8 @@
 #include "config.h"
 
 #include <sys/types.h>
-#if HAVE_MMAP
 #include <sys/mman.h>
 #include <sys/stat.h>
-#endif
 
 #include <assert.h>
 #include <ctype.h>
@@ -143,7 +141,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"empty argument, using 0n",
 	"missing display type, using -ragged",
 	"list type is not the first argument",
-	"missing -width in -tag list, using 6n",
+	"missing -width in -tag list, using 8n",
 	"missing utility name, using \"\"",
 	"missing function name, using \"\"",
 	"empty head in list item",
@@ -425,17 +423,11 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 				i += 2;
 				/* Comment, skip to end of line */
 				for (; i < blk.sz; ++i) {
-					if (blk.buf[i] != '\n')
-						continue;
-					if (blk.buf[i - 1] == ' ' ||
-					    blk.buf[i - 1] == '\t')
-						mandoc_msg(
-						    MANDOCERR_SPACE_EOL,
-						    curp, curp->line,
-						    pos, NULL);
-					++i;
-					++lnn;
-					break;
+					if ('\n' == blk.buf[i]) {
+						++i;
+						++lnn;
+						break;
+					}
 				}
 
 				/* Backout trailing whitespaces */
@@ -604,7 +596,6 @@ read_whole_file(struct mparse *curp, const char *file,
 	size_t		 off;
 	ssize_t		 ssz;
 
-#if HAVE_MMAP
 	struct stat	 st;
 
 	if (fstat(fd, &st) == -1)
@@ -628,7 +619,6 @@ read_whole_file(struct mparse *curp, const char *file,
 		if (fb->buf != MAP_FAILED)
 			return 1;
 	}
-#endif
 
 	if (curp->gzip) {
 		if ((gz = gzdopen(fd, "rb")) == NULL)
@@ -753,11 +743,9 @@ mparse_readfd(struct mparse *curp, int fd, const char 
 		    (MPARSE_UTF8 | MPARSE_LATIN1);
 		mparse_parse_buffer(curp, blk, file);
 		curp->filenc = save_filenc;
-#if HAVE_MMAP
 		if (with_mmap)
 			munmap(blk.buf, blk.sz);
 		else
-#endif
 			free(blk.buf);
 	}
 	return curp->file_status;