===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/mandoc/mdoc_macro.c	2009/08/09 21:59:41	1.19
--- src/usr.bin/mandoc/mdoc_macro.c	2009/08/22 15:36:58	1.20
***************
*** 1,4 ****
! /*	$Id: mdoc_macro.c,v 1.19 2009/08/09 21:59:41 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc_macro.c,v 1.20 2009/08/22 15:36:58 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 681,687 ****
  		mdoc->next = MDOC_NEXT_CHILD;
  	}
  
! 	for (lastarg = ppos, flushed = j = 0; ; j++) {
  		lastarg = *pos;
  
  		if (j == maxargs && ! flushed) {
--- 681,687 ----
  		mdoc->next = MDOC_NEXT_CHILD;
  	}
  
! 	for (flushed = j = 0; ; j++) {
  		lastarg = *pos;
  
  		if (j == maxargs && ! flushed) {
***************
*** 760,766 ****
  		break;
  	}
  
! 	for (la = ppos, arg = NULL;; ) {
  		la = *pos;
  		c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
--- 760,766 ----
  		break;
  	}
  
! 	for (arg = NULL;; ) {
  		la = *pos;
  		c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
***************
*** 1046,1052 ****
  
  	/* XXX - no known argument macros. */
  
! 	for (lastarg = ppos;; ) {
  		lastarg = *pos;
  		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
  		assert(ARGS_PHRASE != c);
--- 1046,1052 ----
  
  	/* XXX - no known argument macros. */
  
! 	for (;;) {
  		lastarg = *pos;
  		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
  		assert(ARGS_PHRASE != c);
***************
*** 1107,1113 ****
  	int		  lastarg, flushed, j, c, maxargs;
  	char		 *p;
  
- 	lastarg = ppos;
  	flushed = 0;
  
  	/*
--- 1107,1112 ----
***************
*** 1243,1249 ****
  		break;
  	}
  
! 	for (lastarg = ppos, arg = NULL;; ) {
  		lastarg = *pos;
  		c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
--- 1242,1248 ----
  		break;
  	}
  
! 	for (arg = NULL;; ) {
  		lastarg = *pos;
  		c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);