===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.377
retrieving revision 1.379
diff -u -p -r1.377 -r1.379
--- mandoc/roff.c	2021/06/27 17:57:55	1.377
+++ mandoc/roff.c	2021/10/04 10:12:27	1.379
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.377 2021/06/27 17:57:55 schwarze Exp $ */
+/* $Id: roff.c,v 1.379 2021/10/04 10:12:27 schwarze Exp $ */
 /*
  * Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -3667,7 +3667,9 @@ roff_char(ROFF_ARGS)
 		case ESCAPE_FONTITALIC:
 		case ESCAPE_FONTBOLD:
 		case ESCAPE_FONTBI:
-		case ESCAPE_FONTCW:
+		case ESCAPE_FONTCR:
+		case ESCAPE_FONTCB:
+		case ESCAPE_FONTCI:
 		case ESCAPE_FONTPREV:
 			font++;
 			break;
@@ -3947,9 +3949,7 @@ roff_userdef(ROFF_ARGS)
 		r->mstacksz += 8;
 	}
 	ctx = r->mstack + r->mstackpos;
-	ctx->argsz = 0;
 	ctx->argc = 0;
-	ctx->argv = NULL;
 
 	/*
 	 * Collect pointers to macro argument strings,