===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.167
retrieving revision 1.169
diff -u -p -r1.167 -r1.169
--- mandoc/mdoc.c	2010/12/01 16:38:57	1.167
+++ mandoc/mdoc.c	2010/12/15 23:39:40	1.169
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.167 2010/12/01 16:38:57 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.169 2010/12/15 23:39:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -552,6 +552,8 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
 		n->parent->nchild--;
 		if (n->parent->child == n)
 			n->parent->child = n->prev ? n->prev : n->next;
+		if (n->parent->last == n)
+			n->parent->last = n->prev ? n->prev : NULL;
 	}
 
 	/* Adjust parse point, if applicable. */
@@ -766,9 +768,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 
 	tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 	if (MDOC_MAX == tok) {
-		mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, 
-		    "unknown macro: %s%s", 
-		    buf, strlen(buf) > 3 ? "..." : "");
+		mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
 		return(1);
 	}