===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -c -r1.91 -r1.92
*** src/usr.bin/mandoc/roff.c	2014/07/06 18:46:51	1.91
--- src/usr.bin/mandoc/roff.c	2014/07/06 19:08:56	1.92
***************
*** 1,4 ****
! /*	$Id: roff.c,v 1.91 2014/07/06 18:46:51 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: roff.c,v 1.92 2014/07/06 19:08:56 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 538,545 ****
  			break;
  		default:
  			if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))
! 				mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
! 				    ln, (int)(stesc - *bufp), NULL);
  			continue;
  		}
  
--- 538,546 ----
  			break;
  		default:
  			if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))
! 				mandoc_vmsg(MANDOCERR_ESC_BAD,
! 				    r->parse, ln, (int)(stesc - *bufp),
! 				    "%.*s", (int)(cp - stesc), stesc);
  			continue;
  		}
  
***************
*** 584,591 ****
  		arg_complete = 1;
  		for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) {
  			if ('\0' == *cp) {
! 				mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
! 				    ln, (int)(stesc - *bufp), NULL);
  				arg_complete = 0;
  				break;
  			}
--- 585,592 ----
  		arg_complete = 1;
  		for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) {
  			if ('\0' == *cp) {
! 				mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
! 				    ln, (int)(stesc - *bufp), stesc);
  				arg_complete = 0;
  				break;
  			}
***************
*** 627,634 ****
  		}
  
  		if (NULL == res) {
! 			mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
! 			    ln, (int)(stesc - *bufp), NULL);
  			res = "";
  		}
  
--- 628,636 ----
  		}
  
  		if (NULL == res) {
! 			mandoc_vmsg(MANDOCERR_STR_UNDEF,
! 			    r->parse, ln, (int)(stesc - *bufp),
! 			    "%.*s", (int)naml, stnam);
  			res = "";
  		}
  
***************
*** 1890,1898 ****
  		if ('\\' == *first) {
  			esc = mandoc_escape(&p, NULL, NULL);
  			if (ESCAPE_ERROR == esc) {
! 				mandoc_msg(MANDOCERR_BADESCAPE,
! 				    r->parse, ln,
! 				    (int)(p - *bufp), NULL);
  				return(ROFF_IGN);
  			}
  			fsz = (size_t)(p - first);
--- 1892,1899 ----
  		if ('\\' == *first) {
  			esc = mandoc_escape(&p, NULL, NULL);
  			if (ESCAPE_ERROR == esc) {
! 				mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
! 				    ln, (int)(p - *bufp), first);
  				return(ROFF_IGN);
  			}
  			fsz = (size_t)(p - first);
***************
*** 1902,1910 ****
  		if ('\\' == *second) {
  			esc = mandoc_escape(&p, NULL, NULL);
  			if (ESCAPE_ERROR == esc) {
! 				mandoc_msg(MANDOCERR_BADESCAPE,
! 				    r->parse, ln,
! 				    (int)(p - *bufp), NULL);
  				return(ROFF_IGN);
  			}
  			ssz = (size_t)(p - second);
--- 1903,1910 ----
  		if ('\\' == *second) {
  			esc = mandoc_escape(&p, NULL, NULL);
  			if (ESCAPE_ERROR == esc) {
! 				mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
! 				    ln, (int)(p - *bufp), second);
  				return(ROFF_IGN);
  			}
  			ssz = (size_t)(p - second);