===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- mandoc/libmdoc.h	2009/07/19 21:26:27	1.20
+++ mandoc/libmdoc.h	2009/08/19 14:09:33	1.24
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.20 2009/07/19 21:26:27 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.24 2009/08/19 14:09:33 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -43,12 +43,10 @@ struct	mdoc {
 
 enum	merr {
 	ETAILWS = 0,
-	ECOLEMPTY,
 	EQUOTPARM,
 	EQUOTTERM,
 	EMALLOC,
 	EARGVAL,	
-	ENOCALL,
 	EBODYPROL,
 	EPROLBODY,
 	ETEXTPROL,
@@ -89,18 +87,16 @@ enum	merr {
 	ENOWIDTH,
 	EUTSNAME,
 	EOBS,
-	EMACPARM,
 	EIMPBRK,
 	EIGNE,
 	EOPEN,
 	EQUOTPHR,
 	ENOCTX,
-	ESPACE,
 	ELIB,
 	MERRMAX
 };
 
-#define	MACRO_PROT_ARGS	struct mdoc *mdoc, int tok, int line, \
+#define	MACRO_PROT_ARGS	struct mdoc *m, int tok, int line, \
 			int ppos, int *pos, char *buf
 
 struct	mdoc_macro {