===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -c -r1.268 -r1.269
*** src/usr.bin/mandoc/roff.c	2022/12/26 19:16:02	1.268
--- src/usr.bin/mandoc/roff.c	2023/10/21 17:10:12	1.269
***************
*** 1,4 ****
! /* $OpenBSD: roff.c,v 1.268 2022/12/26 19:16:02 jmc Exp $ */
  /*
   * Copyright (c) 2010-2015, 2017-2022 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
--- 1,4 ----
! /* $OpenBSD: roff.c,v 1.269 2023/10/21 17:10:12 schwarze Exp $ */
  /*
   * Copyright (c) 2010-2015, 2017-2022 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
***************
*** 1385,1391 ****
  		 */
  
  		if (buf->buf[pos] != ec) {
! 			if (ec != ASCII_ESC && buf->buf[pos] == '\\') {
  				roff_expand_patch(buf, pos, "\\e", pos + 1);
  				pos++;
  			}
--- 1385,1391 ----
  		 */
  
  		if (buf->buf[pos] != ec) {
! 			if (buf->buf[pos] == '\\') {
  				roff_expand_patch(buf, pos, "\\e", pos + 1);
  				pos++;
  			}
***************
*** 1630,1641 ****
  				cp++;
  				break;
  			case '\\':
! 				/*
! 				 * Signal to roff_expand() that an escape
! 				 * sequence resulted from copy-in processing
! 				 * and needs to be checked or interpolated.
! 				 */
! 				cp[-pairs] = ASCII_ESC;
  				newesc = 1;
  				pairs++;
  				cp++;
--- 1630,1636 ----
  				cp++;
  				break;
  			case '\\':
! 				cp[-pairs] = '\\';
  				newesc = 1;
  				pairs++;
  				cp++;
***************
*** 1692,1698 ****
  	buf.buf = start;
  	buf.sz = strlen(start) + 1;
  	buf.next = NULL;
! 	if (roff_expand(r, &buf, ln, 0, ASCII_ESC) & ROFF_IGN) {
  		free(buf.buf);
  		buf.buf = mandoc_strdup("");
  	}
--- 1687,1693 ----
  	buf.buf = start;
  	buf.sz = strlen(start) + 1;
  	buf.next = NULL;
! 	if (roff_expand(r, &buf, ln, 0, '\\') & ROFF_IGN) {
  		free(buf.buf);
  		buf.buf = mandoc_strdup("");
  	}