===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- mandoc/man_term.c	2011/09/20 09:02:23	1.118
+++ mandoc/man_term.c	2011/09/20 13:13:23	1.119
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.118 2011/09/20 09:02:23 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.119 2011/09/20 13:13:23 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -826,7 +826,8 @@ pre_RS(DECL_ARGS)
 			sz = (size_t)ival;
 
 	mt->offset += sz;
-	p->offset = mt->offset;
+	p->rmargin = p->maxrmargin;
+	p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin;
 
 	if (++mt->lmarginsz < MAXMARGINS)
 		mt->lmargincur = mt->lmarginsz;