===================================================================
RCS file: /cvs/mandoc/tag.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mandoc/tag.c	2016/11/08 15:28:17	1.14
+++ mandoc/tag.c	2016/11/08 15:57:28	1.15
@@ -1,4 +1,4 @@
-/*	$Id: tag.c,v 1.14 2016/11/08 15:28:17 schwarze Exp $ */
+/*	$Id: tag.c,v 1.15 2016/11/08 15:57:28 schwarze Exp $ */
 /*
  * Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -130,7 +130,13 @@ tag_put(const char *s, int prio, size_t line)
 	size_t			 len;
 	unsigned int		 slot;
 
-	if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL)
+	/* Sanity checks. */
+
+	if (tag_files.tfd <= 0)
+		return;
+	if (s[0] == '\\' && (s[1] == '&' || s[1] == 'e'))
+		s += 2;
+	if (*s == '\0' || strchr(s, ' ') != NULL)
 		return;
 
 	slot = ohash_qlookup(&tag_data, s);