===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -c -r1.120 -r1.121
*** src/usr.bin/mandoc/mdoc_macro.c	2015/02/01 23:55:37	1.120
--- src/usr.bin/mandoc/mdoc_macro.c	2015/02/02 04:04:18	1.121
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.120 2015/02/01 23:55:37 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.121 2015/02/02 04:04:18 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1075,1082 ****
  {
  	int		  la, nl, parsed;
  	struct mdoc_arg	 *arg;
! 	struct mdoc_node *head; /* save of head macro */
! 	struct mdoc_node *body; /* save of body macro */
  	struct mdoc_node *n;
  	enum margserr	  ac, lac;
  	char		 *p;
--- 1075,1083 ----
  {
  	int		  la, nl, parsed;
  	struct mdoc_arg	 *arg;
! 	struct mdoc_node *blk; /* Our own block. */
! 	struct mdoc_node *head; /* Our own head. */
! 	struct mdoc_node *body; /* Our own body. */
  	struct mdoc_node *n;
  	enum margserr	  ac, lac;
  	char		 *p;
***************
*** 1116,1122 ****
  	 */
  
  	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
! 	mdoc_block_alloc(mdoc, line, ppos, tok, arg);
  	head = body = NULL;
  
  	/*
--- 1117,1123 ----
  	 */
  
  	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
! 	blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
  	head = body = NULL;
  
  	/*
***************
*** 1216,1221 ****
--- 1217,1224 ----
  			break;
  	}
  
+ 	if (blk->flags & MDOC_VALID)
+ 		return;
  	if (head == NULL)
  		head = mdoc_head_alloc(mdoc, line, ppos, tok);
  	if (nl)