===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- mandoc/man_macro.c	2015/02/06 08:28:35	1.96
+++ mandoc/man_macro.c	2015/02/06 09:38:43	1.97
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.96 2015/02/06 08:28:35 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.97 2015/02/06 09:38:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -424,6 +424,13 @@ in_line_eoln(MACRO_PROT_ARGS)
 		    tok == MAN_fi || tok == MAN_nf)) {
 			mandoc_vmsg(MANDOCERR_ARG_SKIP,
 			    man->parse, line, *pos, "%s %s",
+			    man_macronames[tok], buf + *pos);
+			break;
+		}
+		if (buf[*pos] != '\0' && man->last != n &&
+		    (tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) {
+			mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+			    man->parse, line, *pos, "%s ... %s",
 			    man_macronames[tok], buf + *pos);
 			break;
 		}