===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.91
retrieving revision 1.93
diff -u -p -r1.91 -r1.93
--- mandoc/man.c	2010/12/06 15:31:19	1.91
+++ mandoc/man.c	2011/01/01 10:51:30	1.93
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.91 2010/12/06 15:31:19 kristaps Exp $ */
+/*	$Id: man.c,v 1.93 2011/01/01 10:51:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -36,10 +36,10 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"IP",		"HP",		"SM",		"SB",
 	"BI",		"IB",		"BR",		"RB",
 	"R",		"B",		"I",		"IR",
-	"RI",		"na",		"i",		"sp",
-	"nf",		"fi",		"r",		"RE",
-	"RS",		"DT",		"UC",		"PD",
-	"AT",		"in",		"ft"
+	"RI",		"na",		"sp",		"nf",
+	"fi",		"RE",		"RS",		"DT",
+	"UC",		"PD",		"AT",		"in",
+	"ft"
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -348,8 +348,10 @@ man_ptext(struct man *m, int line, char *buf, int offs
 
 	if ('\\' == buf[offs] && 
 			'.' == buf[offs + 1] && 
-			'"' == buf[offs + 2])
-		return(man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
+			'"' == buf[offs + 2]) {
+		man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);
+		return(1);
+	}
 
 	/* Literal free-form text whitespace is preserved. */
 
@@ -381,8 +383,7 @@ man_ptext(struct man *m, int line, char *buf, int offs
 
 	if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
 		if (i > 1 && '\\' != buf[i - 2])
-			if ( ! man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE))
-				return(0);
+			man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE);
 
 		for (--i; i && ' ' == buf[i]; i--)
 			/* Spin back to non-space. */ ;
@@ -488,8 +489,7 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 	 */
 
 	if ('\0' == buf[i] && ' ' == buf[i - 1])
-		if ( ! man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-			goto err;
+		man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);
 
 	/* 
 	 * Remove prior ELINE macro, as it's being clobbered by a new