diff options
| author |   schwarze <schwarze@openbsd.org> | 2010-12-07 00:08:52 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2010-12-07 00:08:52 +0000 |
| commit | b58a7f4f1f6e110bda109f1c4f0366bf1c3cbbb2 (patch) | |
| tree | 2b50e7c7a75ccfd30489e12d7c5485b19c053103 /usr.bin/mandoc/man.c | |
| parent | Back out my .ft implementation for -Thtml. (diff) | |
| download | wireguard-openbsd-b58a7f4f1f6e110bda109f1c4f0366bf1c3cbbb2.tar.xz wireguard-openbsd-b58a7f4f1f6e110bda109f1c4f0366bf1c3cbbb2.zip | |
Complete the merge of bsd.lv version 1.10.7:
No more functional changes, just sync ordering, comments and white space.
Diffstat (limited to 'usr.bin/mandoc/man.c')
| -rw-r--r-- | usr.bin/mandoc/man.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c index 8778aea1408..8b2621facd8 100644 --- a/usr.bin/mandoc/man.c +++ b/usr.bin/mandoc/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.48 2010/12/01 23:02:59 schwarze Exp $ */ +/* $Id: man.c,v 1.49 2010/12/07 00:08:52 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -517,12 +517,13 @@ man_pmacro(struct man *m, int ln, char *buf, int offs) n = m->last; assert(MAN_TEXT != n->type); - /* .B .br .br .B: remove prior including children */ + /* Remove repeated NSCOPED macros causing ELINE. */ + if (MAN_NSCOPED & man_macros[n->tok].flags) n = n->parent; man_vmsg(m, MANDOCERR_LINESCOPE, n->line, n->pos, - "%s", man_macronames[n->tok]); + "%s", man_macronames[n->tok]); man_node_delete(m, n); m->flags &= ~MAN_ELINE; |