===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -c -r1.113 -r1.114
*** src/usr.bin/mandoc/term.c	2015/10/12 00:07:27	1.113
--- src/usr.bin/mandoc/term.c	2015/10/13 22:57:49	1.114
***************
*** 1,4 ****
! /*	$OpenBSD: term.c,v 1.113 2015/10/12 00:07:27 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: term.c,v 1.114 2015/10/13 22:57:49 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 452,463 ****
  			break;
  		case ESCAPE_SPECIAL:
  			if (p->enc == TERMENC_ASCII) {
! 				cp = mchars_spec2str(p->symtab,
! 				    seq, sz, &ssz);
  				if (cp != NULL)
  					encode(p, cp, ssz);
  			} else {
! 				uc = mchars_spec2cp(p->symtab, seq, sz);
  				if (uc > 0)
  					encode1(p, uc);
  			}
--- 452,462 ----
  			break;
  		case ESCAPE_SPECIAL:
  			if (p->enc == TERMENC_ASCII) {
! 				cp = mchars_spec2str(seq, sz, &ssz);
  				if (cp != NULL)
  					encode(p, cp, ssz);
  			} else {
! 				uc = mchars_spec2cp(seq, sz);
  				if (uc > 0)
  					encode1(p, uc);
  			}
***************
*** 698,710 ****
  				break;
  			case ESCAPE_SPECIAL:
  				if (p->enc == TERMENC_ASCII) {
! 					rhs = mchars_spec2str(p->symtab,
! 					    seq, ssz, &rsz);
  					if (rhs != NULL)
  						break;
  				} else {
! 					uc = mchars_spec2cp(p->symtab,
! 					    seq, ssz);
  					if (uc > 0)
  						sz += cond_width(p, uc, &skip);
  				}
--- 697,707 ----
  				break;
  			case ESCAPE_SPECIAL:
  				if (p->enc == TERMENC_ASCII) {
! 					rhs = mchars_spec2str(seq, ssz, &rsz);
  					if (rhs != NULL)
  						break;
  				} else {
! 					uc = mchars_spec2cp(seq, ssz);
  					if (uc > 0)
  						sz += cond_width(p, uc, &skip);
  				}