From ccc48ef0cb2c302ab906918b551244c55c40d4bf Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sun, 5 Dec 2010 15:55:01 +0000
Subject: Remove long-standing FIXME regarding the consolidation of WIDTHARG
 and NOARGV warnings.  From patch by schwarze@.

---
 main.c          | 3 +--
 mandoc.h        | 4 +---
 mdoc_validate.c | 7 +++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/main.c b/main.c
index 0f6994f8..101ea941 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.117 2010/12/05 15:49:37 kristaps Exp $ */
+/*	$Id: main.c,v 1.118 2010/12/05 15:55:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -133,7 +133,6 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"bad escape sequence",
 	"unterminated quoted string",
 	"argument requires the width argument",
-	"superfluous width argument",
 	"bad date argument",
 	"bad width argument",
 	"unknown manual section",
diff --git a/mandoc.h b/mandoc.h
index 81ea5c5d..7e84f8db 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.28 2010/12/05 15:49:37 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.29 2010/12/05 15:55:01 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -56,8 +56,6 @@ enum	mandocerr {
 	MANDOCERR_BADESCAPE, /* bad escape sequence */
 	MANDOCERR_BADQUOTE, /* unterminated quoted string */
 	MANDOCERR_NOWIDTHARG, /* argument requires the width argument */
-	/* FIXME: merge with MANDOCERR_IGNARGV. */
-	MANDOCERR_WIDTHARG, /* superfluous width argument */
 	MANDOCERR_BADDATE, /* bad date argument */
 	MANDOCERR_BADWIDTH, /* bad width argument */
 	MANDOCERR_BADMSEC, /* unknown manual section */
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 91fc2bfb..e54bbd58 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.136 2010/12/05 15:49:37 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.137 2010/12/05 15:55:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -753,9 +753,8 @@ pre_bl(PRE_ARGS)
 	case (LIST_inset):
 		/* FALLTHROUGH */
 	case (LIST_item):
-		if (NULL == n->data.Bl->width)
-			break;
-		mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG);
+		if (n->data.Bl->width)
+			mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
 		break;
 	default:
 		break;
-- 
cgit v1.2.3-56-ge451