===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.238
retrieving revision 1.241
diff -u -p -r1.238 -r1.241
--- mandoc/roff.c	2014/11/01 06:03:13	1.238
+++ mandoc/roff.c	2014/12/16 01:22:59	1.241
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.238 2014/11/01 06:03:13 schwarze Exp $ */
+/*	$Id: roff.c,v 1.241 2014/12/16 01:22:59 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1249,7 +1249,7 @@ out:
 static int
 roff_evalcond(struct roff *r, int ln, const char *v, int *pos)
 {
-	int	 wanttrue, number;
+	int	 number, savepos, wanttrue;
 
 	if ('!' == v[*pos]) {
 		wanttrue = 0;
@@ -1258,6 +1258,8 @@ roff_evalcond(struct roff *r, int ln, const char *v, i
 		wanttrue = 1;
 
 	switch (v[*pos]) {
+	case '\0':
+		return(0);
 	case 'n':
 		/* FALLTHROUGH */
 	case 'o':
@@ -1272,16 +1274,21 @@ roff_evalcond(struct roff *r, int ln, const char *v, i
 	case 'r':
 		/* FALLTHROUGH */
 	case 't':
+		/* FALLTHROUGH */
+	case 'v':
 		(*pos)++;
 		return(!wanttrue);
 	default:
 		break;
 	}
 
+	savepos = *pos;
 	if (roff_evalnum(r, ln, v, pos, &number, 0))
 		return((number > 0) == wanttrue);
-	else
+	else if (*pos == savepos)
 		return(roff_evalstrcond(v, pos) == wanttrue);
+	else
+		return (0);
 }
 
 static enum rofferr