summaryrefslogtreecommitdiff
path: root/usr.bin/mandoc/read.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2014-08-08 15:42:40 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2014-08-08 15:42:40 +0000
commit62d72299eed88c868d24e97b816fa8e2feddfd70 (patch)
tree849d97a12774e68b416678554f8c95659984015e /usr.bin/mandoc/read.c
parent63a7eef49d5fde2cc7e33a8f8772963a9cff6289 (diff)
In .Bl -column, if some of the column width declarations are given
right after the -column argument and some at the very end of the argument list, after some other arguments like -compact, concatenate the column lists. This gets rid of one of the last useless FATAL errors and actually shortens the code by a few lines. This fixes an issue introduced more than five years ago, at first causing an assert() since bsd.lv mdoc_action.c rev. 1.14 (June 17, 2009), then later a FATAL error since mdoc_validate rev. 1.130 (Nov. 30, 2010), and marked as "TODO" ever since.
Diffstat (limited to 'usr.bin/mandoc/read.c')
-rw-r--r--usr.bin/mandoc/read.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c
index bad2eec70a7..5b57b500de5 100644
--- a/usr.bin/mandoc/read.c
+++ b/usr.bin/mandoc/read.c
@@ -1,4 +1,4 @@
-/* $Id: read.c,v 1.52 2014/08/08 15:38:46 schwarze Exp $ */
+/* $Id: read.c,v 1.53 2014/08/08 15:42:39 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -197,7 +197,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"generic fatal error",
"input too large",
- "column syntax is inconsistent",
"NOT IMPLEMENTED: .Bd -file",
"NOT IMPLEMENTED: .so with absolute path or \"..\"",
".so request failed",