===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.262
retrieving revision 1.264
diff -u -p -r1.262 -r1.264
--- mandoc/mdoc.c	2017/04/24 23:06:18	1.262
+++ mandoc/mdoc.c	2017/05/05 15:17:32	1.264
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.262 2017/04/24 23:06:18 schwarze Exp $ */
+/*	$Id: mdoc.c,v 1.264 2017/05/05 15:17:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -253,7 +253,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
 		 * blank lines aren't allowed, but enough manuals assume this
 		 * behaviour that we want to work around it.
 		 */
-		roff_elem_alloc(mdoc, line, offs, MDOC_sp);
+		roff_elem_alloc(mdoc, line, offs, ROFF_sp);
 		mdoc->last->flags |= NODE_VALID | NODE_ENDED;
 		mdoc->next = ROFF_NEXT_SIBLING;
 		return 1;
@@ -302,25 +302,18 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, 
 {
 	struct roff_node *n;
 	const char	 *cp;
+	size_t		  sz;
 	enum roff_tok	  tok;
-	int		  i, sv;
-	char		  mac[5];
+	int		  sv;
 
-	sv = offs;
+	/* Determine the line macro. */
 
-	/*
-	 * Copy the first word into a nil-terminated buffer.
-	 * Stop when a space, tab, escape, or eoln is encountered.
-	 */
-
-	i = 0;
-	while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)
-		mac[i++] = buf[offs++];
-
-	mac[i] = '\0';
-
-	tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE;
-
+	sv = offs;
+	tok = TOKEN_NONE;
+	for (sz = 0; sz < 4 && strchr(" \t\\", buf[offs]) == NULL; sz++)
+		offs++;
+	if (sz == 2 || sz == 3)
+		tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
 	if (tok == TOKEN_NONE) {
 		mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
 		    ln, sv, buf + sv - 1);