=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.109 retrieving revision 1.113 diff -u -p -r1.109 -r1.113 --- mandoc/term.c 2009/10/22 18:19:36 1.109 +++ mandoc/term.c 2009/10/26 17:05:44 1.113 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.109 2009/10/22 18:19:36 kristaps Exp $ */ +/* $Id: term.c,v 1.113 2009/10/26 17:05:44 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -19,6 +19,7 @@ #include #include #include +#include #include "chars.h" #include "out.h" @@ -130,7 +131,7 @@ void term_flushln(struct termp *p) { int i, j; - size_t vbl, vsz, vis, maxvis, mmax, bp, os; + size_t vbl, vsz, vis, maxvis, mmax, bp; static int overstep = 0; /* @@ -143,9 +144,6 @@ term_flushln(struct termp *p) assert(p->offset < p->rmargin); assert((int)(p->rmargin - p->offset) - overstep > 0); - /* Save the overstep. */ - os = (size_t)overstep; - maxvis = /* LINTED */ p->rmargin - p->offset - overstep; mmax = /* LINTED */ @@ -153,7 +151,6 @@ term_flushln(struct termp *p) bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; vis = 0; - overstep = 0; /* * If in the standard case (left-justified), then begin with our @@ -208,8 +205,9 @@ term_flushln(struct termp *p) vis = 0; } /* Remove the overstep width. */ - bp += os; - os = 0; + bp += (int)/* LINTED */ + overstep; + overstep = 0; } else { for (j = 0; j < (int)vbl; j++) putchar(' '); @@ -226,7 +224,9 @@ term_flushln(struct termp *p) } vis += vsz; } + p->col = 0; + overstep = 0; if ( ! (TERMP_NOBREAK & p->flags)) { putchar('\n');