* index-prop: Use a single pattern. Also support *** cdiffs.

        * index-prop: Don't change /dev/null.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33523 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index a1ebf0a..7ad347a 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-28  Jason Merrill  <jason@casey.cygnus.com>
+
+       * index-prop: Use a single pattern.  Also support *** cdiffs.
+
+2000-04-28  Pavel Roskin <pavel_roskin@geocities.com>
+
+       * index-prop: Don't change /dev/null.
+
 2000-04-27  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
        * gcc_update: Refer to GCC and gcc_update instead of egcs and

diff --git a/contrib/index-prop b/contrib/index-prop
index 285ad8c..1ea6489 100755 (executable)
--- a/contrib/index-prop
+++ b/contrib/index-prop
@@ -14,8 +14,8 @@ while (<>)
       for (1..7)
        {
          $_ = <>;
-         s/^--- [^\t]+\t/--- $full\t/;
-          s/^\+\+\+ [^\t]+\t/\+\+\+ $full\t/;
+         s/^([-+*]{3}) [^\t]+\t/$1 $full\t/
+           unless m{ /dev/null\t};
          print;
        }
     }