===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.135
retrieving revision 1.137
diff -u -p -r1.135 -r1.137
--- mandoc/man.c	2014/07/30 21:18:24	1.135
+++ mandoc/man.c	2014/08/01 21:24:17	1.137
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.135 2014/07/30 21:18:24 schwarze Exp $ */
+/*	$Id: man.c,v 1.137 2014/08/01 21:24:17 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -186,10 +186,11 @@ man_node_append(struct man *man, struct man_node *p)
 	assert(p->parent);
 	p->parent->nchild++;
 
-	if ( ! man_valid_pre(man, p))
-		return(0);
-
 	switch (p->type) {
+	case MAN_BLOCK:
+		if (p->tok == MAN_SH || p->tok == MAN_SS)
+			man->flags &= ~MAN_LITERAL;
+		break;
 	case MAN_HEAD:
 		assert(MAN_BLOCK == p->parent->type);
 		p->parent->head = p;
@@ -496,8 +497,8 @@ man_pmacro(struct man *man, int ln, char *buf, int off
 	tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
 
 	if (MAN_MAX == tok) {
-		mandoc_vmsg(MANDOCERR_MACRO, man->parse, ln, ppos,
-		    "%s", buf + ppos - 1);
+		mandoc_msg(MANDOCERR_MACRO, man->parse,
+		    ln, ppos, buf + ppos - 1);
 		return(1);
 	}