===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -c -r1.88 -r1.89
*** src/usr.bin/mandoc/mdoc_macro.c	2014/04/20 16:44:44	1.88
--- src/usr.bin/mandoc/mdoc_macro.c	2014/07/02 03:47:07	1.89
***************
*** 1,4 ****
! /*	$Id: mdoc_macro.c,v 1.88 2014/04/20 16:44:44 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_macro.c,v 1.89 2014/07/02 03:47:07 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 44,50 ****
  static	int		in_line_eoln(MACRO_PROT_ARGS);
  static	int		in_line_argn(MACRO_PROT_ARGS);
  static	int		in_line(MACRO_PROT_ARGS);
- static	int		obsolete(MACRO_PROT_ARGS);
  static	int		phrase_ta(MACRO_PROT_ARGS);
  
  static	int		dword(struct mdoc *, int, int, const char *,
--- 44,49 ----
***************
*** 100,106 ****
  	{ blk_full, MDOC_JOIN }, /* Nd */
  	{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
  	{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
! 	{ obsolete, 0 }, /* Ot */
  	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
  	{ in_line_eoln, 0 }, /* Rv */
  	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */
--- 99,105 ----
  	{ blk_full, MDOC_JOIN }, /* Nd */
  	{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
  	{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
! 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ot */
  	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
  	{ in_line_eoln, 0 }, /* Rv */
  	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */
***************
*** 187,193 ****
  	{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */
  	{ in_line_eoln, 0 }, /* Bt */
  	{ in_line_eoln, 0 }, /* Hf */
! 	{ obsolete, 0 }, /* Fr */
  	{ in_line_eoln, 0 }, /* Ud */
  	{ in_line, 0 }, /* Lb */
  	{ in_line_eoln, 0 }, /* Lp */
--- 186,192 ----
  	{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */
  	{ in_line_eoln, 0 }, /* Bt */
  	{ in_line_eoln, 0 }, /* Hf */
! 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fr */
  	{ in_line_eoln, 0 }, /* Ud */
  	{ in_line, 0 }, /* Lb */
  	{ in_line_eoln, 0 }, /* Lp */
***************
*** 199,206 ****
  	{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
  			 MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */
  	{ in_line_eoln, MDOC_JOIN }, /* %C */
! 	{ obsolete, 0 }, /* Es */
! 	{ obsolete, 0 }, /* En */
  	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
  	{ in_line_eoln, MDOC_JOIN }, /* %Q */
  	{ in_line_eoln, 0 }, /* br */
--- 198,205 ----
  	{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
  			 MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */
  	{ in_line_eoln, MDOC_JOIN }, /* %C */
! 	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Es */
! 	{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */
  	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
  	{ in_line_eoln, MDOC_JOIN }, /* %Q */
  	{ in_line_eoln, 0 }, /* br */
***************
*** 1524,1529 ****
--- 1523,1530 ----
  		break;
  	case MDOC_Bx:
  		/* FALLTHROUGH */
+ 	case MDOC_Es:
+ 		/* FALLTHROUGH */
  	case MDOC_Xr:
  		maxargs = 2;
  		break;
***************
*** 1709,1722 ****
  		return(blk_full(mdoc, tok, line, ppos, pos, buf));
  	assert(MDOC_Vt == tok);
  	return(blk_part_imp(mdoc, tok, line, ppos, pos, buf));
- }
- 
- static int
- obsolete(MACRO_PROT_ARGS)
- {
- 
- 	mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS);
- 	return(1);
  }
  
  /*
--- 1710,1715 ----