===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/mandoc/mandoc.c	2015/01/01 18:10:09	1.58
--- src/usr.bin/mandoc/mandoc.c	2015/01/21 20:20:49	1.59
***************
*** 1,4 ****
! /*	$OpenBSD: mandoc.c,v 1.58 2015/01/01 18:10:09 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mandoc.c,v 1.59 2015/01/21 20:20:49 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 154,169 ****
  		/* FALLTHROUGH */
  	case 'D':
  		/* FALLTHROUGH */
- 	case 'o':
- 		/* FALLTHROUGH */
  	case 'R':
  		/* FALLTHROUGH */
  	case 'X':
  		/* FALLTHROUGH */
  	case 'Z':
- 		if ('\0' == **start)
- 			return(ESCAPE_ERROR);
  		gly = ESCAPE_IGNORE;
  		term = **start;
  		*start = ++*end;
  		break;
--- 154,171 ----
  		/* FALLTHROUGH */
  	case 'D':
  		/* FALLTHROUGH */
  	case 'R':
  		/* FALLTHROUGH */
  	case 'X':
  		/* FALLTHROUGH */
  	case 'Z':
  		gly = ESCAPE_IGNORE;
+ 		/* FALLTHROUGH */
+ 	case 'o':
+ 		if (**start == '\0')
+ 			return(ESCAPE_ERROR);
+ 		if (gly == ESCAPE_ERROR)
+ 			gly = ESCAPE_OVERSTRIKE;
  		term = **start;
  		*start = ++*end;
  		break;