===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/manpath.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** src/usr.bin/mandoc/manpath.c	2018/10/02 14:56:36	1.23
--- src/usr.bin/mandoc/manpath.c	2018/11/22 11:30:15	1.24
***************
*** 1,4 ****
! /*	$OpenBSD: manpath.c,v 1.23 2018/10/02 14:56:36 schwarze Exp $ */
  /*
   * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
--- 1,4 ----
! /*	$OpenBSD: manpath.c,v 1.24 2018/11/22 11:30:15 schwarze Exp $ */
  /*
   * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
***************
*** 232,239 ****
  manconf_output(struct manoutput *conf, const char *cp, int fromfile)
  {
  	const char *const toks[] = {
! 	    "includes", "man", "paper", "style",
! 	    "indent", "width", "fragment", "mdoc", "noval", "toc"
  	};
  
  	const char	*errstr;
--- 232,239 ----
  manconf_output(struct manoutput *conf, const char *cp, int fromfile)
  {
  	const char *const toks[] = {
! 	    "includes", "man", "paper", "style", "indent", "width",
! 	    "tag", "fragment", "mdoc", "noval", "toc"
  	};
  
  	const char	*errstr;
***************
*** 257,263 ****
  		warnx("-O %s=?: Missing argument value", toks[tok]);
  		return -1;
  	}
! 	if ((tok == 6 || tok == 7) && *cp != '\0') {
  		warnx("-O %s: Does not take a value: %s", toks[tok], cp);
  		return -1;
  	}
--- 257,263 ----
  		warnx("-O %s=?: Missing argument value", toks[tok]);
  		return -1;
  	}
! 	if (tok > 6 && *cp != '\0') {
  		warnx("-O %s: Does not take a value: %s", toks[tok], cp);
  		return -1;
  	}
***************
*** 312,326 ****
  		warnx("-O width=%s is %s", cp, errstr);
  		return -1;
  	case 6:
! 		conf->fragment = 1;
  		return 0;
  	case 7:
! 		conf->mdoc = 1;
  		return 0;
  	case 8:
! 		conf->noval = 1;
  		return 0;
  	case 9:
  		conf->toc = 1;
  		return 0;
  	default:
--- 312,333 ----
  		warnx("-O width=%s is %s", cp, errstr);
  		return -1;
  	case 6:
! 		if (conf->tag != NULL) {
! 			oldval = mandoc_strdup(conf->tag);
! 			break;
! 		}
! 		conf->tag = mandoc_strdup(cp);
  		return 0;
  	case 7:
! 		conf->fragment = 1;
  		return 0;
  	case 8:
! 		conf->mdoc = 1;
  		return 0;
  	case 9:
+ 		conf->noval = 1;
+ 		return 0;
+ 	case 10:
  		conf->toc = 1;
  		return 0;
  	default: