===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/mandoc/mdoc_macro.c	2010/10/24 18:15:43	1.59
--- src/usr.bin/mandoc/mdoc_macro.c	2010/12/01 22:02:29	1.60
***************
*** 1,4 ****
! /*	$Id: mdoc_macro.c,v 1.59 2010/10/24 18:15:43 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_macro.c,v 1.60 2010/12/01 22:02:29 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 258,272 ****
  	while (mdoc->last != to) {
  		if ( ! mdoc_valid_post(mdoc))
  			return(0);
- 		if ( ! mdoc_action_post(mdoc))
- 			return(0);
  		mdoc->last = mdoc->last->parent;
  		assert(mdoc->last);
  	}
  
! 	if ( ! mdoc_valid_post(mdoc))
! 		return(0);
! 	return(mdoc_action_post(mdoc));
  }
  
  
--- 258,268 ----
  	while (mdoc->last != to) {
  		if ( ! mdoc_valid_post(mdoc))
  			return(0);
  		mdoc->last = mdoc->last->parent;
  		assert(mdoc->last);
  	}
  
! 	return(mdoc_valid_post(mdoc));
  }
  
  
***************
*** 697,706 ****
  		if (later &&
  		    MDOC_EXPLICIT & mdoc_macros[later->tok].flags)
  			continue;
! 		if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) {
! 			assert( ! (MDOC_ACTED & n->flags));
  			later = n;
- 		}
  	}
  
  	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
--- 693,700 ----
  		if (later &&
  		    MDOC_EXPLICIT & mdoc_macros[later->tok].flags)
  			continue;
! 		if (MDOC_CALLABLE & mdoc_macros[n->tok].flags)
  			later = n;
  	}
  
  	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
***************
*** 791,797 ****
  		/* FALLTHROUGH */
  	case (MDOC_Fl):
  		/* FALLTHROUGH */
! 	case (MDOC_Lk):
  		/* FALLTHROUGH */
  	case (MDOC_Nm):
  		/* FALLTHROUGH */
--- 785,791 ----
  		/* FALLTHROUGH */
  	case (MDOC_Fl):
  		/* FALLTHROUGH */
! 	case (MDOC_Mt):
  		/* FALLTHROUGH */
  	case (MDOC_Nm):
  		/* FALLTHROUGH */
***************
*** 1144,1150 ****
  		if (MDOC_BLOCK == n->type && 
  				MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
  				! (MDOC_VALID & n->flags)) {
- 			assert( ! (MDOC_ACTED & n->flags));
  			n->pending = head;
  			return(1);
  		}
--- 1138,1143 ----
***************
*** 1282,1288 ****
  		if (MDOC_BLOCK == n->type &&
  		    MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
  		    ! (MDOC_VALID & n->flags)) {
- 			assert( ! (MDOC_ACTED & n->flags));
  			make_pending(n, tok, m, line, ppos);
  			if ( ! mdoc_endbody_alloc(m, line, ppos,
  			    tok, body, ENDBODY_NOSPACE))
--- 1275,1280 ----