===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_action.c,v
retrieving revision 1.49
retrieving revision 1.52
diff -u -p -r1.49 -r1.52
--- mandoc/Attic/mdoc_action.c	2009/11/02 06:22:45	1.49
+++ mandoc/Attic/mdoc_action.c	2010/04/05 09:03:12	1.52
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_action.c,v 1.49 2009/11/02 06:22:45 kristaps Exp $ */
+/*	$Id: mdoc_action.c,v 1.52 2010/04/05 09:03:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef	OSNAME
 #include <sys/utsname.h>
 #endif
@@ -42,10 +46,6 @@ static	int	  concat(struct mdoc *, char *,
 			const struct mdoc_node *, size_t);
 static	inline int order_rs(int);
 
-#ifdef __linux__
-extern	size_t	  strlcat(char *, const char *, size_t);
-#endif
-
 static	int	  post_ar(POST_ARGS);
 static	int	  post_at(POST_ARGS);
 static	int	  post_bl(POST_ARGS);
@@ -420,7 +420,11 @@ post_sh(POST_ARGS)
 	if ( ! concat(m, buf, n->child, BUFSIZ))
 		return(0);
 	sec = mdoc_atosec(buf);
-	if (SEC_CUSTOM != sec)
+	/*
+	 * The first section should always make us move into a non-new
+	 * state.
+	 */
+	if (SEC_NONE == m->lastnamed || SEC_CUSTOM != sec)
 		m->lastnamed = sec;
 
 	/* Some sections only live in certain manual sections. */
@@ -647,7 +651,8 @@ static int
 post_bl_width(POST_ARGS)
 {
 	size_t		  width;
-	int		  i, tok;
+	int		  i;
+	enum mdoct	  tok;
 	char		  buf[NUMSIZ];
 	char		 *p;