fix for texi2dvi

[Werner LEMBERG]

Below is a fix for the line offset problem in error messages.
Additionally, it fixes a problem with macros enclosed in @ifnotinfo
environments: If a script contained different macro definitions in
@ifinfo and @ifnotinfo, both were removed.  I haven't extensively
tested whether this additional fix (the last three lines in the diff)
always works.


    Werner


PS: Has makeinfo fixed meanwhile to avoid this clumsy script, using
    the --no-ifinfo option and its friends?

======================================================================
--- /usr/bin/texi2dvi   Tue May  9 01:00:47 2000
+++ texi2dvi    Wed Mar 21 08:42:37 2001
@@ -205,13 +205,23 @@
     s/address@hidden texi2dvi//
   }
 }
-/address@hidden/,/address@hidden html/d
-/address@hidden/,/address@hidden ifhtml/d
-/address@hidden/,/address@hidden ifnottex/d
+/address@hidden/,/address@hidden html/{
+  s/^/@c (texi2dvi)/
+}
+/address@hidden/,/address@hidden ifhtml/{
+  s/^/@c (texi2dvi)/
+}
+/address@hidden/,/address@hidden ifnottex/{
+  s/^/@c (texi2dvi)/
+}
 /address@hidden/,/address@hidden ifinfo/{
   /address@hidden/p
   /address@hidden/,/address@hidden menu/p
-  d
+  t
+  s/^/@c (texi2dvi)/
+  /address@hidden (texi2dvi)@macro/,/address@hidden (texi2dvi)@end macro/{
+    s/address@hidden (texi2dvi)//
+  }
 }
 EOF
 # Uncommenting is simple: Remove any leading address@hidden texi2dvi'.