summaryrefslogtreecommitdiffstatshomepage
path: root/main.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-12-05 15:37:30 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-12-05 15:37:30 +0000
commitb35e18840fdc536364e4d41b021fe53af309bb59 (patch)
treee3a70878bf36aefdb4f8f568eb3a38a112e3dbda /main.c
parent41593da964a8b2d9a3a505a574df65af794a486c (diff)
downloadmandoc-b35e18840fdc536364e4d41b021fe53af309bb59.tar.gz
mandoc-b35e18840fdc536364e4d41b021fe53af309bb59.tar.zst
mandoc-b35e18840fdc536364e4d41b021fe53af309bb59.zip
Merge schwarze@'s changes allowing nested displays. Tweak the patch by
making sure output doesn't add a superfluous newline with the nested displays. Also add a COMPATIBILITY note. Rename a macro (DATESIZ) to be in line with OpenBSD (DATESIZE).
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index b8f24416..5624134f 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.115 2010/12/02 20:41:46 schwarze Exp $ */
+/* $Id: main.c,v 1.116 2010/12/05 15:37:30 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -146,6 +146,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"NAME section must come first",
"bad Boolean value",
"child violates parent syntax",
+ "displays may not be nested",
"bad AT&T symbol",
"bad standard",
"list type repeated",
@@ -183,7 +184,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"generic fatal error",
"column syntax is inconsistent",
- "displays may not be nested",
"unsupported display type",
"blocks badly nested",
"no such block is open",