texinfo/makeinfo makeinfo.c,1.42,1.43

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv14199/makeinfo

Modified Files:
        makeinfo.c 
Log Message:
2004-02-07  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (next_nonwhitespace_character): also check
        global input_text since filestack does not contain it.



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** makeinfo.c  7 Feb 2004 10:26:28 -0000       1.42
--- makeinfo.c  7 Feb 2004 11:36:39 -0000       1.43
***************
*** 3231,3251 ****
  next_nonwhitespace_character ()
  {
!   FSTACK *tos = filestack;
  
!   while (filestack)
      {
!       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;
  }
--- 3231,3266 ----
  next_nonwhitespace_character ()
  {
!   /* First check the current input_text.  Start from the next char because
!      we already have input_text[input_text_offset] in ``current''.  */
!   int pos = input_text_offset + 1;
  
!   while (pos < input_text_length)
      {
!       if (!cr_or_whitespace(input_text[pos]))
!         return input_text[pos];
!       pos++;
!     }
  
!   { /* Can't find a valid character, so go through filestack
!        in case we are doing @include or expanding a macro.  */
!     FSTACK *tos = filestack;
! 
!     while (tos)
!       {
!         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++;
!           }
! 
!         tos = tos->next;
!       }
!   }
  
    return -1;
  }