===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -c -r1.128 -r1.129
*** src/usr.bin/mandoc/mdoc_macro.c	2015/02/03 18:19:27	1.128
--- src/usr.bin/mandoc/mdoc_macro.c	2015/02/04 18:03:28	1.129
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.128 2015/02/03 18:19:27 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.129 2015/02/04 18:03:28 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1025,1032 ****
  		la = *pos;
  		lac = ac;
  		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
- 		if (ac == ARGS_PUNCT)
- 			break;
  		if (ac == ARGS_EOLN) {
  			if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE)
  				break;
--- 1025,1030 ----
***************
*** 1042,1047 ****
--- 1040,1052 ----
  			body = mdoc_body_alloc(mdoc, line, ppos, tok);
  			break;
  		}
+ 		if (tok == MDOC_Rs) {
+ 			mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
+ 			    line, la, "Rs %s", buf + la);
+ 			break;
+ 		}
+ 		if (ac == ARGS_PUNCT)
+ 			break;
  
  		/*
  		 * Emit leading punctuation (i.e., punctuation before
***************
*** 1098,1104 ****
  		return;
  	if (head == NULL)
  		head = mdoc_head_alloc(mdoc, line, ppos, tok);
! 	if (nl)
  		append_delims(mdoc, line, pos, buf);
  	if (body != NULL)
  		goto out;
--- 1103,1109 ----
  		return;
  	if (head == NULL)
  		head = mdoc_head_alloc(mdoc, line, ppos, tok);
! 	if (nl && tok != MDOC_Rs)
  		append_delims(mdoc, line, pos, buf);
  	if (body != NULL)
  		goto out;