===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.150.2.1
retrieving revision 1.150.2.2
diff -u -p -r1.150.2.1 -r1.150.2.2
--- mandoc/read.c	2016/10/18 22:44:29	1.150.2.1
+++ mandoc/read.c	2016/11/10 12:52:12	1.150.2.2
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.150.2.1 2016/10/18 22:44:29 schwarze Exp $ */
+/*	$Id: read.c,v 1.150.2.2 2016/11/10 12:52:12 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -425,11 +425,17 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 				i += 2;
 				/* Comment, skip to end of line */
 				for (; i < blk.sz; ++i) {
-					if ('\n' == blk.buf[i]) {
-						++i;
-						++lnn;
-						break;
-					}
+					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;
 				}
 
 				/* Backout trailing whitespaces */