In the fallback code to look for manual pages without using mandoc.db(5),

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index d195576dee2806528b21830f3df99165cbeca6c3..b3c3a3cb488b273bca0d81bc65dca51bfc1c6bbe 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: man_macro.c,v 1.144 2019/01/05 18:59:46 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.145 2020/09/09 17:01:10 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -107,9 +107,11 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
                                mandoc_msg(MANDOCERR_BLK_LINE,
                                    n->line, n->pos,
                                    "EOF breaks %s", roff_name[n->tok]);
-                               if (man->flags & MAN_ELINE)
-                                       man->flags &= ~MAN_ELINE;
-                               else {
+                               if (man->flags & MAN_ELINE) {
+                                       if ((man_macro(n->parent->tok)->flags &
+                                           MAN_ESCOPED) == 0)
+                                               man->flags &= ~MAN_ELINE;
+                               } else {
                                        assert(n->type == ROFFT_HEAD);
                                        n = n->parent;
                                        man->flags &= ~MAN_BLINE;