===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -c -r1.80 -r1.81
*** src/usr.bin/mandoc/term.c	2014/03/30 21:27:59	1.80
--- src/usr.bin/mandoc/term.c	2014/04/05 21:17:48	1.81
***************
*** 1,4 ****
! /*	$Id: term.c,v 1.80 2014/03/30 21:27:59 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: term.c,v 1.81 2014/04/05 21:17:48 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 626,631 ****
--- 626,633 ----
  	size_t		 width;
  	int		 iop;
  
+ 	iop = 0;
+ 	width = 0;
  	if (NULL != wstr) {
  		switch (*wstr) {
  		case ('+'):
***************
*** 637,651 ****
  			wstr++;
  			break;
  		default:
- 			iop = 0;
  			break;
  		}
! 		if ( ! a2roffsu(wstr, &su, SCALE_MAX)) {
! 			wstr = NULL;
  			iop = 0;
- 		}
  	}
- 	width = (NULL != wstr) ? term_hspan(p, &su) : 0;
  	(*p->setwidth)(p, iop, width);
  }
  
--- 639,651 ----
  			wstr++;
  			break;
  		default:
  			break;
  		}
! 		if (a2roffsu(wstr, &su, SCALE_MAX))
! 			width = term_hspan(p, &su);
! 		else
  			iop = 0;
  	}
  	(*p->setwidth)(p, iop, width);
  }