===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- mandoc/mdoc_macro.c	2011/12/03 23:59:14	1.113
+++ mandoc/mdoc_macro.c	2012/01/02 15:48:05	1.114
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.113 2011/12/03 23:59:14 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.114 2012/01/02 15:48:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -228,7 +228,6 @@ mdoc_macroend(struct mdoc *m)
 static enum mdoct
 lookup(enum mdoct from, const char *p)
 {
-	/* FIXME: make -diag lists be un-PARSED. */
 
 	if ( ! (MDOC_PARSED & mdoc_macros[from].flags))
 		return(MDOC_MAX);
@@ -984,7 +983,7 @@ in_line(MACRO_PROT_ARGS)
 static int
 blk_full(MACRO_PROT_ARGS)
 {
-	int		  la, nl;
+	int		  la, nl, nparsed;
 	struct mdoc_arg	 *arg;
 	struct mdoc_node *head; /* save of head macro */
 	struct mdoc_node *body; /* save of body macro */
@@ -995,6 +994,16 @@ blk_full(MACRO_PROT_ARGS)
 	enum margverr	  av;
 	char		 *p;
 
+	/*
+	 * Exception: `-diag' lists are not parsed, but lists in general
+	 * are parsed.
+	 */
+	nparsed = 0;
+	if (MDOC_It == tok && NULL != m->last &&
+			MDOC_Bl == m->last->tok &&
+			LIST_diag == m->last->norm->Bl.type)
+		nparsed = 1;
+
 	nl = MDOC_NEWLINE & m->flags;
 
 	/* Close out prior implicit scope. */
@@ -1146,7 +1155,8 @@ blk_full(MACRO_PROT_ARGS)
 			continue;
 		}
 
-		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
+		ntok = nparsed || ARGS_QWORD == ac ? 
+			MDOC_MAX : lookup(tok, p);
 
 		if (MDOC_MAX == ntok) {
 			if ( ! dword(m, line, la, p, DELIM_MAX))