===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mandoc/man_macro.c	2009/06/16 19:55:28	1.16
+++ mandoc/man_macro.c	2009/06/18 10:53:58	1.17
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.16 2009/06/16 19:55:28 kristaps Exp $ */
+/*	$Id: man_macro.c,v 1.17 2009/06/18 10:53:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -82,16 +82,14 @@ man_macro(struct man *man, int tok, int line, 
 
 	if (n == man->last && (FL_NLINE & man_flags[tok])) {
 		if (MAN_NLINE & man->flags) 
-			return(man_verr(man, line, ppos, 
-				"next-line scope already open"));
+			return(man_perr(man, line, ppos, WLNSCOPE));
 		man->flags |= MAN_NLINE;
 		return(1);
 	}
 
 	if (FL_TLINE & man_flags[tok]) {
 		if (MAN_NLINE & man->flags) 
-			return(man_verr(man, line, ppos, 
-				"next-line scope already open"));
+			return(man_perr(man, line, ppos, WLNSCOPE));
 		man->flags |= MAN_NLINE;
 		return(1);
 	}
@@ -186,7 +184,7 @@ man_args(struct man *m, int line, 
 		if (buf[*pos])
 			return(1);
 
-		if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+		if ( ! man_pwarn(m, line, *pos, WTSPACE))
 			return(-1);
 
 		return(1);
@@ -204,7 +202,7 @@ man_args(struct man *m, int line, 
 		(*pos)++;
 
 	if (0 == buf[*pos]) {
-		if ( ! man_vwarn(m, line, *pos, "unterminated quote"))
+		if ( ! man_pwarn(m, line, *pos, WTQUOTE))
 			return(-1);
 		return(1);
 	}
@@ -219,7 +217,7 @@ man_args(struct man *m, int line, 
 	if (buf[*pos])
 		return(1);
 
-	if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+	if ( ! man_pwarn(m, line, *pos, WTSPACE))
 		return(-1);
 	return(1);
 }