diff options
| author |   schwarze <schwarze@openbsd.org> | 2017-05-05 02:06:17 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2017-05-05 02:06:17 +0000 |
| commit | c4d3fa85a07f248616304fddbff2b40c876fcc18 (patch) | |
| tree | 315bbdbedaf8bdbb8dbdebb07b481d9caa290788 /usr.bin/mandoc/man_macro.c | |
| parent | Also pass the blk offset to disk_unbusy(), so that it can pass it to (diff) | |
| download | wireguard-openbsd-c4d3fa85a07f248616304fddbff2b40c876fcc18.tar.xz wireguard-openbsd-c4d3fa85a07f248616304fddbff2b40c876fcc18.zip | |
Move handling of the roff(7) .ft request from the man(7)
modules to the new roff(7) modules. As a side effect,
mdoc(7) now handles .ft, too. Of course, do not use that.
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index 780ae8a417e..6371e385cba 100644 --- a/usr.bin/mandoc/man_macro.c +++ b/usr.bin/mandoc/man_macro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man_macro.c,v 1.79 2017/05/04 17:48:24 schwarze Exp $ */ +/* $OpenBSD: man_macro.c,v 1.80 2017/05/05 02:06:17 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -69,7 +69,6 @@ const struct man_macro __man_macros[MAN_MAX - MAN_TH] = { { in_line_eoln, MAN_NSCOPED }, /* PD */ { in_line_eoln, 0 }, /* AT */ { in_line_eoln, 0 }, /* in */ - { in_line_eoln, 0 }, /* ft */ { in_line_eoln, 0 }, /* OP */ { in_line_eoln, MAN_BSCOPE }, /* EX */ { in_line_eoln, MAN_BSCOPE }, /* EE */ @@ -332,7 +331,7 @@ in_line_eoln(MACRO_PROT_ARGS) break; } if (buf[*pos] != '\0' && man->last != n && - (tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { + (tok == MAN_PD || tok == MAN_sp)) { mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, *pos, "%s ... %s", roff_name[tok], buf + *pos); |