===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.65
retrieving revision 1.67
diff -u -p -r1.65 -r1.67
--- mandoc/mdoc_argv.c	2011/03/17 01:23:28	1.65
+++ mandoc/mdoc_argv.c	2011/03/17 10:41:18	1.67
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_argv.c,v 1.65 2011/03/17 01:23:28 kristaps Exp $ */
+/*	$Id: mdoc_argv.c,v 1.67 2011/03/17 10:41:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -405,8 +405,7 @@ args(struct mdoc *m, int line, int *pos, 
 		 * is unterminated.
 		 */
 		if (MDOC_PHRASELIT & m->flags)
-			if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE))
-				return(ARGS_ERROR);
+			mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE);
 
 		m->flags &= ~MDOC_PHRASELIT;
 		return(ARGS_EOLN);
@@ -420,9 +419,7 @@ args(struct mdoc *m, int line, int *pos, 
 			return(ARGS_PUNCT);
 		if (ARGS_NOWARN & fl)
 			return(ARGS_PUNCT);
-		/* FIXME: remove conditional messages... */
-		if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
-			return(ARGS_ERROR);
+		mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE);
 		return(ARGS_PUNCT);
 	}
 
@@ -473,8 +470,7 @@ args(struct mdoc *m, int line, int *pos, 
 
 		/* Whitespace check for eoln case... */
 		if ('\0' == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))
-			if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
-				return(ARGS_ERROR);
+			mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE);
 
 		*pos += (int)(p - *v);
 
@@ -518,8 +514,7 @@ args(struct mdoc *m, int line, int *pos, 
 		if ('\0' == buf[*pos]) {
 			if (ARGS_NOWARN & fl || MDOC_PPHRASE & m->flags)
 				return(ARGS_QWORD);
-			if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE))
-				return(ARGS_ERROR);
+			mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE);
 			return(ARGS_QWORD);
 		}
 
@@ -533,8 +528,7 @@ args(struct mdoc *m, int line, int *pos, 
 			(*pos)++;
 
 		if (0 == buf[*pos] && ! (ARGS_NOWARN & fl))
-			if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
-				return(ARGS_ERROR);
+			mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE);
 
 		return(ARGS_QWORD);
 	}
@@ -557,8 +551,7 @@ args(struct mdoc *m, int line, int *pos, 
 		(*pos)++;
 
 	if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl))
-		if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
-			return(ARGS_ERROR);
+		mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE);
 
 	return(ARGS_WORD);
 }
@@ -587,7 +580,7 @@ args_checkpunct(const char *p)
 		return(0);
 
 	buf[j] = '\0';
-	if (DELIM_CLOSE != mdoc_isdelim(buf))
+	if (DELIM_CLOSE != mandoc_isdelim(buf))
 		return(0);
 
 	while (' ' == p[i])
@@ -604,7 +597,7 @@ args_checkpunct(const char *p)
 			return(0);
 
 		buf[j] = '\0';
-		d = mdoc_isdelim(buf);
+		d = mandoc_isdelim(buf);
 		if (DELIM_NONE == d || DELIM_OPEN == d)
 			return(0);