===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_macro.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- src/usr.bin/mandoc/man_macro.c	2015/01/24 10:07:58	1.57
+++ src/usr.bin/mandoc/man_macro.c	2015/02/06 08:28:03	1.58
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man_macro.c,v 1.57 2015/01/24 10:07:58 schwarze Exp $ */
+/*	$OpenBSD: man_macro.c,v 1.58 2015/02/06 08:28:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -418,6 +418,13 @@
 	n = man->last;
 
 	for (;;) {
+		if (buf[*pos] != '\0' && (tok == MAN_br ||
+		    tok == MAN_fi || tok == MAN_nf)) {
+			mandoc_vmsg(MANDOCERR_ARG_SKIP,
+			    man->parse, line, *pos, "%s %s",
+			    man_macronames[tok], buf + *pos);
+			break;
+		}
 		la = *pos;
 		if ( ! man_args(man, line, pos, buf, &p))
 			break;