===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- mandoc/read.c	2015/01/20 21:16:51	1.112
+++ mandoc/read.c	2015/01/22 19:26:50	1.113
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.112 2015/01/20 21:16:51 schwarze Exp $ */
+/*	$Id: read.c,v 1.113 2015/01/22 19:26:50 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -307,6 +307,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size
 {
 	const struct tbl_span	*span;
 	struct buf	 ln;
+	const char	*save_file;
 	char		*cp;
 	size_t		 pos; /* byte number in the ln buffer */
 	enum rofferr	 rr;
@@ -522,11 +523,14 @@ rerun:
 			 */
 			if (curp->secondary)
 				curp->secondary->sz -= pos + 1;
+			save_file = curp->file;
 			save_child = curp->child;
 			if (mparse_open(curp, &fd, ln.buf + of) ==
-			    MANDOCLEVEL_OK)
+			    MANDOCLEVEL_OK) {
 				mparse_readfd(curp, fd, ln.buf + of);
-			else {
+				curp->file = save_file;
+			} else {
+				curp->file = save_file;
 				mandoc_vmsg(MANDOCERR_SO_FAIL,
 				    curp, curp->line, pos,
 				    ".so %s", ln.buf + of);