===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -c -r1.139 -r1.140
*** src/usr.bin/mandoc/main.c	2015/04/18 16:04:40	1.139
--- src/usr.bin/mandoc/main.c	2015/04/18 16:34:03	1.140
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.139 2015/04/18 16:04:40 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.140 2015/04/18 16:34:03 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 607,613 ****
  parse(struct curparse *curp, int fd, const char *file)
  {
  	enum mandoclevel  rctmp;
- 	struct roff_man	 *mdoc;
  	struct roff_man	 *man;
  
  	/* Begin by parsing the file itself. */
--- 607,612 ----
***************
*** 695,708 ****
  		}
  	}
  
! 	mparse_result(curp->mp, &mdoc, &man, NULL);
  
  	/* Execute the out device, if it exists. */
  
! 	if (man && curp->outman)
  		(*curp->outman)(curp->outdata, man);
- 	if (mdoc && curp->outmdoc)
- 		(*curp->outmdoc)(curp->outdata, mdoc);
  }
  
  static void
--- 694,709 ----
  		}
  	}
  
! 	mparse_result(curp->mp, &man, NULL);
  
  	/* Execute the out device, if it exists. */
  
! 	if (man == NULL)
! 		return;
! 	if (curp->outmdoc != NULL && man->macroset == MACROSET_MDOC)
! 		(*curp->outmdoc)(curp->outdata, man);
! 	if (curp->outman != NULL && man->macroset == MACROSET_MAN)
  		(*curp->outman)(curp->outdata, man);
  }
  
  static void