===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- mandoc/man_term.c	2013/12/22 23:34:13	1.139
+++ mandoc/man_term.c	2014/02/16 12:33:39	1.140
@@ -1,7 +1,7 @@
-/*	$Id: man_term.c,v 1.139 2013/12/22 23:34:13 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.140 2014/02/16 12:33:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -658,7 +658,8 @@ pre_IP(DECL_ARGS)
 		return(0);
 	case (MAN_BODY):
 		p->offset = mt->offset + len;
-		p->rmargin = p->maxrmargin;
+		p->rmargin = p->maxrmargin > p->offset ?
+				p->maxrmargin : p->offset;
 		break;
 	default:
 		break;
@@ -748,7 +749,8 @@ pre_TP(DECL_ARGS)
 		return(0);
 	case (MAN_BODY):
 		p->offset = mt->offset + len;
-		p->rmargin = p->maxrmargin;
+		p->rmargin = p->maxrmargin > p->offset ?
+				p->maxrmargin : p->offset;
 		p->trailspace = 0;
 		p->flags &= ~TERMP_NOBREAK;
 		break;
@@ -909,8 +911,9 @@ pre_RS(DECL_ARGS)
 			sz = (size_t)ival;
 
 	mt->offset += sz;
-	p->rmargin = p->maxrmargin;
-	p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin;
+	p->offset = mt->offset;
+	p->rmargin = p->maxrmargin > p->offset ?
+			p->maxrmargin : p->offset;
 
 	if (++mt->lmarginsz < MAXMARGINS)
 		mt->lmargincur = mt->lmarginsz;