===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/usr.bin/mandoc/man_term.c	2010/05/15 18:06:03	1.31
+++ src/usr.bin/mandoc/man_term.c	2010/05/15 21:09:53	1.32
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.31 2010/05/15 18:06:03 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.32 2010/05/15 21:09:53 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -161,8 +161,14 @@
 
 	p = (struct termp *)arg;
 
+	/*
+	 * XXX
+	 * Hardcode the -man output width for now;
+	 * it is not yet externally configurable, anyway.
+	 */
+	p->defrmargin = 65;
+	p->maxrmargin = p->defrmargin;
 	p->overstep = 0;
-	p->maxrmargin = 65;
 
 	if (NULL == p->symtab)
 		switch (p->enc) {
@@ -802,6 +808,7 @@
 static void
 print_man_node(DECL_ARGS)
 {
+	size_t		 rm, rmax;
 	int		 c;
 
 	c = 1;
@@ -818,10 +825,13 @@
 		/* FIXME: this means that macro lines are munged!  */
 
 		if (MANT_LITERAL & mt->fl) {
+			rm = p->rmargin;
+			rmax = p->maxrmargin;
 			p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 			p->flags |= TERMP_NOSPACE;
 			term_flushln(p);
-			p->rmargin = p->maxrmargin = 65;
+			p->rmargin = rm;
+			p->maxrmargin = rmax;
 		}
 		break;
 	default: