texinfo/makeinfo insertion.c,1.9,1.10

[dirt]

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

Modified Files:
        insertion.c 
Log Message:
2004-01-06  Alper Ersoy  <address@hidden>

        * makeinfo/insertion.c (begin_insertion): keep line_number the same
        before and after get_until, so messages issued inside full_expansion
        have correct line numbers.



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** insertion.c 28 Dec 2003 13:02:28 -0000      1.9
--- insertion.c 6 Jan 2004 14:50:10 -0000       1.10
***************
*** 512,518 ****
--- 512,524 ----
          int start_of_end;
        int save_paragraph_indentation;
+         int save_line_number;
+         int real_line_number;
  
          discard_until ("\n"); /* ignore remainder of @copying line */
+ 
+         save_line_number = line_number;
          start_of_end = get_until ("address@hidden copying", &text);
+         real_line_number = line_number;
+         line_number = save_line_number;
  
          /* include all the output-format-specific markup.  */
***************
*** 529,532 ****
--- 535,541 ----
  
          input_text_offset = start_of_end; /* go back to the @end to match */
+ 
+         line_number = real_line_number;
+         line_number--;
        }
  
***************
*** 551,554 ****
--- 560,564 ----
        if (docbook)
          xml_insert_element (LEGALNOTICE, END);
+ 
        break;