===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.218
retrieving revision 1.221
diff -u -p -r1.218 -r1.221
--- mandoc/read.c	2020/04/18 20:40:10	1.218
+++ mandoc/read.c	2022/05/19 14:48:56	1.221
@@ -1,4 +1,4 @@
-/* $Id: read.c,v 1.218 2020/04/18 20:40:10 schwarze Exp $ */
+/* $Id: read.c,v 1.221 2022/05/19 14:48:56 schwarze Exp $ */
 /*
  * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -154,6 +154,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 	struct buf	*firstln, *lastln, *thisln, *loop;
 	char		*cp;
 	size_t		 pos; /* byte number in the ln buffer */
+	size_t		 spos; /* at the start of the current line parse */
 	int		 line_result, result;
 	int		 of;
 	int		 lnn; /* line number in the real file */
@@ -180,6 +181,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 			    curp->filenc & MPARSE_LATIN1)
 				curp->filenc = preconv_cue(&blk, i);
 		}
+		spos = pos;
 
 		while (i < blk.sz && (start || blk.buf[i] != '\0')) {
 
@@ -259,7 +261,12 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 			lastln = thisln;
 		}
 
-		/* XXX Ugly hack to mark the end of the input. */
+		/*
+		 * XXX Ugly hack to mark the end of the input,
+		 * such that the function roff_parse_comment()
+		 * doesn't attempt to append another line if the
+		 * last input line ends with an escape character.
+		 */
 
 		if (i == blk.sz || blk.buf[i] == '\0') {
 			if (pos + 2 > ln.sz)
@@ -279,7 +286,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 
 		of = 0;
 rerun:
-		line_result = roff_parseln(curp->roff, curp->line, &ln, &of);
+		line_result = roff_parseln(curp->roff, curp->line,
+		    &ln, &of, start && spos == 0 ? pos : 0);
 
 		/* Process options. */
 
@@ -554,7 +562,7 @@ mparse_readfd(struct mparse *curp, int fd, const char 
 
 	struct buf	 blk;
 	struct buf	*save_primary;
-	const char	*save_filename;
+	const char	*save_filename, *cp;
 	size_t		 offset;
 	int		 save_filenc, save_lineno;
 	int		 with_mmap;
@@ -562,7 +570,13 @@ mparse_readfd(struct mparse *curp, int fd, const char 
 	if (recursion_depth > 64) {
 		mandoc_msg(MANDOCERR_ROFFLOOP, curp->line, 0, NULL);
 		return;
-	}
+	} else if (recursion_depth == 0 &&
+	    (cp = strrchr(filename, '.')) != NULL &&
+            cp[1] >= '1' && cp[1] <= '9')
+                curp->man->filesec = cp[1];
+        else
+                curp->man->filesec = '\0';
+
 	if (read_whole_file(curp, fd, &blk, &with_mmap) == -1)
 		return;