Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.41
diff -u -p -r1.41 makeinfo.c
--- makeinfo/makeinfo.c	3 Feb 2004 12:15:59 -0000	1.41
+++ makeinfo/makeinfo.c	7 Feb 2004 10:23:39 -0000
@@ -3230,15 +3230,22 @@ search_forward_until_pos (string, from, 
 int
 next_nonwhitespace_character ()
 {
-  /* Start from the next char, because we already hold
-     input_text[input_text_offset] in character variable.  */
-  int pos = input_text_offset + 1;
+  FSTACK *tos = filestack;
 
-  while (pos < input_text_length)
+  while (filestack)
     {
-      if (!cr_or_whitespace(input_text[pos]))
-        return input_text[pos];
-      pos++;
+      int tmp_input_text_length = filestack->size;
+      int tmp_input_text_offset = filestack->offset;
+      char *tmp_input_text = filestack->text;
+
+      while (tmp_input_text_offset < tmp_input_text_length)
+        {
+          if (!cr_or_whitespace(tmp_input_text[tmp_input_text_offset]))
+            return tmp_input_text[tmp_input_text_offset];
+          tmp_input_text_offset++;
+        }
+
+      filestack = filestack->next;
     }
   return -1;
 }