===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- mandoc/mdoc_macro.c	2014/11/28 04:47:03	1.151
+++ mandoc/mdoc_macro.c	2014/11/28 23:21:32	1.152
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.151 2014/11/28 04:47:03 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.152 2014/11/28 23:21:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -843,7 +843,6 @@ static void
 in_line(MACRO_PROT_ARGS)
 {
 	int		 la, scope, cnt, firstarg, mayopen, nc, nl;
-	enum margverr	 av;
 	enum mdoct	 ntok;
 	enum margserr	 ac;
 	enum mdelim	 d;
@@ -876,15 +875,7 @@ in_line(MACRO_PROT_ARGS)
 		break;
 	}
 
-	for (arg = NULL;; ) {
-		la = *pos;
-		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-		if (av == ARGV_ARG)
-			continue;
-		if (av == ARGV_WORD)
-			*pos = la;
-		break;
-	}
+	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
 	d = DELIM_NONE;
 	firstarg = 1;
@@ -1041,7 +1032,6 @@ blk_full(MACRO_PROT_ARGS)
 	struct mdoc_node *n;
 	enum mdoct	  ntok;
 	enum margserr	  ac, lac;
-	enum margverr	  av;
 	char		 *p;
 
 	nl = MDOC_NEWLINE & mdoc->flags;
@@ -1078,16 +1068,7 @@ blk_full(MACRO_PROT_ARGS)
 	 * regular child nodes.
 	 */
 
-	for (arg = NULL;; ) {
-		la = *pos;
-		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-		if (av == ARGV_ARG)
-			continue;
-		if (av == ARGV_WORD)
-			*pos = la;
-		break;
-	}
-
+	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 	mdoc_block_alloc(mdoc, line, ppos, tok, arg);
 	head = body = NULL;
 
@@ -1402,7 +1383,6 @@ in_line_argn(MACRO_PROT_ARGS)
 {
 	int		 la, flushed, j, maxargs, nl;
 	enum margserr	 ac;
-	enum margverr	 av;
 	struct mdoc_arg	*arg;
 	char		*p;
 	enum mdoct	 ntok;
@@ -1437,15 +1417,7 @@ in_line_argn(MACRO_PROT_ARGS)
 		break;
 	}
 
-	for (arg = NULL; ; ) {
-		la = *pos;
-		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-		if (av == ARGV_ARG)
-			continue;
-		if (av == ARGV_WORD)
-			*pos = la;
-		break;
-	}
+	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
 	for (flushed = j = 0; ; ) {
 		la = *pos;
@@ -1502,7 +1474,6 @@ in_line_eoln(MACRO_PROT_ARGS)
 {
 	int		 la;
 	enum margserr	 ac;
-	enum margverr	 av;
 	struct mdoc_arg	*arg;
 	char		*p;
 	enum mdoct	 ntok;
@@ -1512,20 +1483,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 	if (tok == MDOC_Pp)
 		rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);
 
-	/* Parse macro arguments. */
-
-	for (arg = NULL; ; ) {
-		la = *pos;
-		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-		if (av == ARGV_ARG)
-			continue;
-		if (av == ARGV_WORD)
-			*pos = la;
-		break;
-	}
-
-	/* Open element scope. */
-
+	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 	mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
 
 	/* Parse argument terms. */