From 474275049b94784ab1ba9fe2bfd75951a46e975a Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Fri, 26 Oct 2001 08:08:26 +0000
Subject: Oops, that new heading-level error check was a bit over-zealous.
 Fixed again.

[originally from svn r1330]
---
 buttress.h | 2 +-
 contents.c | 3 ++-
 keywords.c | 9 +--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/buttress.h b/buttress.h
index 8f8961a..04c0dbb 100644
--- a/buttress.h
+++ b/buttress.h
@@ -375,7 +375,7 @@ void index_debug(index *);
  */
 numberstate *number_init(void);
 void number_cfg(numberstate *, paragraph *);
-word *number_mktext(numberstate *, int, int, int, word **, filepos);
+word *number_mktext(numberstate *, int, int, int, word **, filepos, int *);
 void number_free(numberstate *);
 
 /*
diff --git a/contents.c b/contents.c
index 7688d75..6032133 100644
--- a/contents.c
+++ b/contents.c
@@ -116,7 +116,7 @@ void number_cfg(numberstate *state, paragraph *source) {
 }
 
 word *number_mktext(numberstate *state, int para, int aux, int prev,
-		    word **auxret, filepos fpos) {
+		    word **auxret, filepos fpos, int *errflag) {
     word *ret = NULL;
     word **ret2 = &ret;
     word **pret = &ret;
@@ -139,6 +139,7 @@ word *number_mktext(numberstate *state, int para, int aux, int prev,
 	level = (para == para_Heading ? 0 : aux);
 	if (level > state->oklevel) {
 	    error(err_sectjump, &fpos);
+	    *errflag = TRUE;
 	    return NULL;
 	}
 	state->oklevel = level+1;
diff --git a/keywords.c b/keywords.c
index 7dd35b1..b401690 100644
--- a/keywords.c
+++ b/keywords.c
@@ -104,14 +104,7 @@ keywordlist *get_keywords(paragraph *source) {
 	 */
 	source->kwtext = number_mktext(n, source->type, source->aux,
 				       prevpara, &source->kwtext2,
-				       source->fpos);
-	if (!source->kwtext) {
-	    /* There was an error collecting the section numbers.
-	     * number_mktext has reported it; we record it and bail
-	     * out at the end. */
-	    errors = TRUE;
-	    continue;
-	}
+				       source->fpos, &errors);
 	prevpara = source->type;
 
 	if (source->keyword && *source->keyword) {
-- 
cgit v1.1