===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.224
retrieving revision 1.226
diff -u -p -r1.224 -r1.226
--- mandoc/mandocdb.c	2016/07/29 15:26:37	1.224
+++ mandoc/mandocdb.c	2016/08/05 17:22:45	1.226
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.224 2016/07/29 15:26:37 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.226 2016/08/05 17:22:45 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -427,7 +427,8 @@ mandocdb(int argc, char *argv[])
 		if (OP_TEST != op && 0 == set_basedir(path_arg, 1))
 			goto out;
 
-		if ((dba = dba_read(MANDOC_DB)) != NULL) {
+		dba = nodb ? dba_new(128) : dba_read(MANDOC_DB);
+		if (dba != NULL) {
 			/*
 			 * The existing database is usable.  Process
 			 * all files specified on the command-line.
@@ -444,7 +445,7 @@ mandocdb(int argc, char *argv[])
 			use_all = 1;
 			for (i = 0; i < argc; i++)
 				filescan(argv[i]);
-			if (OP_TEST != op)
+			if (nodb == 0)
 				dbprune(dba);
 		} else {
 			/*
@@ -1692,7 +1693,7 @@ parse_mdoc_Nm(struct mpage *mpage, const struct roff_m
 	if ( ! (mpage->name_head_done ||
 	    n->child == NULL || n->child->string == NULL ||
 	    strcasecmp(n->child->string, meta->title))) {
-		putkey(mpage, n->child->string, ROFFT_HEAD);
+		putkey(mpage, n->child->string, NAME_HEAD);
 		mpage->name_head_done = 1;
 	}
 	return 0;