===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.113
retrieving revision 1.115
diff -u -p -r1.113 -r1.115
--- mandoc/mandoc.c	2018/12/18 22:00:02	1.113
+++ mandoc/mandoc.c	2019/05/21 08:04:21	1.115
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.113 2018/12/18 22:00:02 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.115 2019/05/21 08:04:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,6 +32,7 @@
 #include "mandoc.h"
 #include "roff.h"
 #include "libmandoc.h"
+#include "roff_int.h"
 
 static	int	 a2time(time_t *, const char *, const char *);
 static	char	*time2a(time_t);
@@ -540,10 +541,10 @@ mandoc_normdate(struct roff_man *man, char *in, int ln
 
 	/* No date specified: use today's date. */
 
-	if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) {
+	if (in == NULL || *in == '\0')
 		mandoc_msg(MANDOCERR_DATE_MISSING, ln, pos, NULL);
+	if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0)
 		return time2a(time(NULL));
-	}
 
 	/* Valid mdoc(7) date format. */
 
@@ -563,7 +564,7 @@ mandoc_normdate(struct roff_man *man, char *in, int ln
 		mandoc_msg(MANDOCERR_DATE_BAD, ln, pos, "%s", in);
 	else if (t > time(NULL) + 86400)
 		mandoc_msg(MANDOCERR_DATE_FUTURE, ln, pos, "%s", in);
-	else if (man->macroset == MACROSET_MDOC)
+	else if (man->meta.macroset == MACROSET_MDOC)
 		mandoc_msg(MANDOCERR_DATE_LEGACY, ln, pos, "Dd %s", in);
 
 	/* Use any non-mdoc(7) date verbatim. */