===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.80
retrieving revision 1.82
diff -u -p -r1.80 -r1.82
--- mandoc/mandoc.c	2014/06/20 17:24:00	1.80
+++ mandoc/mandoc.c	2014/07/06 18:37:34	1.82
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.80 2014/06/20 17:24:00 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.82 2014/07/06 18:37:34 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -200,8 +200,10 @@ mandoc_escape(const char **end, const char **start, in
 	case 'v':
 		/* FALLTHROUGH */
 	case 'x':
-		if (strchr("\0 %&()*+-./0123456789:<=>", **start))
+		if (strchr(" %&()*+-./0123456789:<=>", **start)) {
+			++*end;
 			return(ESCAPE_ERROR);
+		}
 		gly = ESCAPE_IGNORE;
 		term = **start;
 		*start = ++*end;
@@ -516,7 +518,7 @@ mandoc_normdate(struct mparse *parse, char *in, int ln
 		t = 0;
 	else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
 	    !a2time(&t, "%b %d, %Y", in)) {
-		mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, NULL);
+		mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
 		t = 0;
 	}
 	out = t ? time2a(t) : NULL;