===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mandoc/mandoc.c	2014/03/23 11:25:26	1.76
+++ mandoc/mandoc.c	2014/04/07 17:51:10	1.77
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.76 2014/03/23 11:25:26 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.77 2014/04/07 17:51:10 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -179,11 +179,11 @@ mandoc_escape(const char **end, const char **start, in
 	case ('X'):
 		/* FALLTHROUGH */
 	case ('Z'):
-		if ('\'' != **start)
+		if ('\0' == **start)
 			return(ESCAPE_ERROR);
 		gly = ESCAPE_IGNORE;
+		term = **start;
 		*start = ++*end;
-		term = '\'';
 		break;
 
 	/*
@@ -203,11 +203,11 @@ mandoc_escape(const char **end, const char **start, in
 	case ('v'):
 		/* FALLTHROUGH */
 	case ('x'):
-		if ('\'' != **start)
+		if (strchr("\0 %&()*+-./0123456789:<=>", **start))
 			return(ESCAPE_ERROR);
 		gly = ESCAPE_IGNORE;
+		term = **start;
 		*start = ++*end;
-		term = '\'';
 		break;
 
 	/*