diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-07-26 23:48:02 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-07-26 23:48:02 +0000 |
| commit | cc909b722a2c865dd9cb393b187178c84258ec7a (patch) | |
| tree | 32c8f4eeabe058e0e95b26dc9b3c95ab3c6850db /usr.bin | |
| parent | f8d5dddb1165b2cc85f11de322d2375adc22b4ac (diff) | |
sync to 1.8.1: explicit-close macros now only warn when encountering
trailing terms and do not error out any more, try: .Ed foo
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mandoc/mdoc_macro.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c index efd1e0869ba..3778d15d8cc 100644 --- a/usr.bin/mandoc/mdoc_macro.c +++ b/usr.bin/mandoc/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.13 2009/07/26 01:59:46 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.14 2009/07/26 23:48:01 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -662,13 +662,13 @@ blk_exp_close(MACRO_PROT_ARGS) } if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { - if (0 == buf[*pos]) { - if ( ! rew_subblock(MDOC_BODY, mdoc, - tok, line, ppos)) + if (buf[*pos]) + if ( ! mdoc_pwarn(mdoc, line, ppos, ENOLINE)) return(0); - return(rew_expblock(mdoc, tok, line, ppos)); - } - return(mdoc_perr(mdoc, line, ppos, ENOLINE)); + + if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos)) + return(0); + return(rew_expblock(mdoc, tok, line, ppos)); } if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos)) |