===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term_ascii.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/usr.bin/mandoc/term_ascii.c	2018/08/21 16:01:38	1.48
--- src/usr.bin/mandoc/term_ascii.c	2018/11/28 14:23:02	1.49
***************
*** 1,4 ****
! /*	$OpenBSD: term_ascii.c,v 1.48 2018/08/21 16:01:38 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: term_ascii.c,v 1.49 2018/11/28 14:23:02 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 79,85 ****
  	p->setwidth = ascii_setwidth;
  	p->width = ascii_width;
  
! 	if (TERMENC_ASCII != enc) {
  
  		/*
  		 * Do not change any of this to LC_ALL.  It might break
--- 79,85 ----
  	p->setwidth = ascii_setwidth;
  	p->width = ascii_width;
  
! 	if (enc != TERMENC_ASCII) {
  
  		/*
  		 * Do not change any of this to LC_ALL.  It might break
***************
*** 88,94 ****
  		 * worst case, it might even cause buffer overflows.
  		 */
  
! 		v = TERMENC_LOCALE == enc ?
  		    setlocale(LC_CTYPE, "") :
  		    setlocale(LC_CTYPE, "en_US.UTF-8");
  
--- 88,94 ----
  		 * worst case, it might even cause buffer overflows.
  		 */
  
! 		v = enc == TERMENC_LOCALE ?
  		    setlocale(LC_CTYPE, "") :
  		    setlocale(LC_CTYPE, "en_US.UTF-8");
  
***************
*** 102,108 ****
  			v = setlocale(LC_CTYPE, "C");
  
  		if (v != NULL && MB_CUR_MAX > 1) {
! 			p->enc = enc;
  			p->advance = locale_advance;
  			p->endline = locale_endline;
  			p->letter = locale_letter;
--- 102,108 ----
  			v = setlocale(LC_CTYPE, "C");
  
  		if (v != NULL && MB_CUR_MAX > 1) {
! 			p->enc = TERMENC_UTF8;
  			p->advance = locale_advance;
  			p->endline = locale_endline;
  			p->letter = locale_letter;