Remove duplicate UNCONST definition.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 4f15a3d144024d3eb07e3274ac874518198e7c8a..dbc4b4b032b6e15e4d255009b44b93a4bb32090f 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.53 2010/12/06 15:31:19 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.55 2011/01/12 16:55:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -69,11 +69,9 @@ const        struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
        { in_line_eoln, MAN_NSCOPED }, /* na */
-       { in_line_eoln, 0 }, /* i */
        { in_line_eoln, MAN_NSCOPED }, /* sp */
        { in_line_eoln, 0 }, /* nf */
        { in_line_eoln, 0 }, /* fi */
-       { in_line_eoln, 0 }, /* r */
        { blk_close, 0 }, /* RE */
        { blk_exp, MAN_EXPLICIT }, /* RS */
        { in_line_eoln, 0 }, /* DT */
@@ -109,19 +107,27 @@ rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
  * will be used if an explicit block scope is being closed out.
  */
 int
-man_unscope(struct man *m, const struct man_node *n, 
+man_unscope(struct man *m, const struct man_node *to, 
                enum mandocerr er)
 {
+       struct man_node *n;
 
-       assert(n);
+       assert(to);
 
        /* LINTED */
-       while (m->last != n) {
+       while (m->last != to) {
+               /*
+                * Save the parent here, because we may delete the
+                * m->last node in the post-validation phase and reset
+                * it to m->last->parent, causing a step in the closing
+                * out to be lost.
+                */
+               n = m->last->parent;
                if ( ! rew_warn(m, m->last, er))
                        return(0);
                if ( ! man_valid_post(m))
                        return(0);
-               m->last = m->last->parent;
+               m->last = n;
                assert(m->last);
        }