===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.129
retrieving revision 1.131
diff -u -p -r1.129 -r1.131
--- mandoc/man.c	2014/04/20 16:46:04	1.129
+++ mandoc/man.c	2014/07/06 19:09:00	1.131
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.129 2014/04/20 16:46:04 schwarze Exp $ */
+/*	$Id: man.c,v 1.131 2014/07/06 19:09:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -447,7 +447,8 @@ man_ptext(struct man *man, int line, char *buf, int of
 
 	if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
 		if (i > 1 && '\\' != buf[i - 2])
-			man_pmsg(man, line, i - 1, MANDOCERR_EOLNSPACE);
+			mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+			    line, i - 1, NULL);
 
 		for (--i; i && ' ' == buf[i]; i--)
 			/* Spin back to non-space. */ ;
@@ -483,7 +484,8 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 	struct man_node	*n;
 
 	if ('"' == buf[offs]) {
-		man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT);
+		mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
+		    ln, offs, NULL);
 		return(1);
 	} else if ('\0' == buf[offs])
 		return(1);
@@ -521,7 +523,8 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 	 */
 
 	if ('\0' == buf[offs] && ' ' == buf[offs - 1])
-		man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE);
+		mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+		    ln, offs - 1, NULL);
 
 	/*
 	 * Remove prior ELINE macro, as it's being clobbered by a new
@@ -595,9 +598,12 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 
 	/* In quick mode (for mandocdb), abort after the NAME section. */
 
-	if (man->quick && MAN_SH == tok &&
-	    strcmp(man->last->prev->child->string, "NAME"))
-		return(2);
+	if (man->quick && MAN_SH == tok) {
+		n = man->last;
+		if (MAN_BODY == n->type &&
+		    strcmp(n->prev->child->string, "NAME"))
+			return(2);
+	}
 
 	/*
 	 * We weren't in a block-line scope when entering the