diff options
| author | Robert Mustacchi <rm@fingolfin.org> | 2021-09-19 15:33:09 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@fingolfin.org> | 2022-01-05 17:44:35 +0000 |
| commit | 4d131170e62381276a07ffc0aeb1b62e527d940c (patch) | |
| tree | 372e6149d42aaa6f1c380866e02ee7ee085a414d /usr/src/cmd/mandoc/man_macro.c | |
| parent | a8f22b53d198f9565c2921ca50c571579c4ea52f (diff) | |
| download | illumos-joyent-4d131170e62381276a07ffc0aeb1b62e527d940c.tar.gz | |
14111 Update mandoc to 1.14.6
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/mandoc/man_macro.c')
| -rw-r--r-- | usr/src/cmd/mandoc/man_macro.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/cmd/mandoc/man_macro.c b/usr/src/cmd/mandoc/man_macro.c index d195576dee..b3c3a3cb48 100644 --- a/usr/src/cmd/mandoc/man_macro.c +++ b/usr/src/cmd/mandoc/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; |