===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- mandoc/roff.c	2008/12/04 16:19:52	1.37
+++ mandoc/roff.c	2008/12/04 16:34:59	1.38
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.37 2008/12/04 16:19:52 kristaps Exp $ */
+/* $Id: roff.c,v 1.38 2008/12/04 16:34:59 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -971,12 +971,20 @@ roffdata(struct rofftree *tree, int space, char *buf)
 {
 	int		 tok;
 
+	if (0 == *buf)
+		return(1);
+
 	if (-1 == (tok = rofftok_scan(buf))) {
 		roff_err(tree, buf, "invalid character sequence");
 		return(0);
-	} else if (ROFFTok_MAX != tok) 
+	} else if (ROFFTok_MAX != tok) {
+		if (ROFFTok_Null == tok) { /* FIXME */
+			buf += 2;
+			return(roffdata(tree, space, buf));
+		}
 		return((*tree->cb.rofftoken)
 				(tree->arg, space != 0, tok));
+	}
 
 	return((*tree->cb.roffdata)(tree->arg, 
 				space != 0, tree->cur, buf));