--- code/trunk/ChangeLog	2011/01/14 19:01:25	587
+++ code/trunk/ChangeLog	2011/01/15 11:22:47	588
@@ -1,7 +1,7 @@
 ChangeLog for PCRE
 ------------------
 
-Version 8.12 12-Jan-2011
+Version 8.15 12-Jan-2011
 ------------------------
 
 1.  Fixed some typos in the markup of the man pages, and wrote a script that
@@ -9,7 +9,7 @@
     
 2.  On a big-endian 64-bit system, pcregrep did not correctly process the
     --match-limit and --recursion-limit options (added for 8.11). In
-    particular, this made one of the standard tests crash. (The integer value 
+    particular, this made one of the standard tests fail. (The integer value 
     went into the wrong half of a long int.)
     
 3.  If the --colour option was given to pcregrep with -v (invert match), it
@@ -24,7 +24,12 @@
     matched in multiline mode, the following line was shown as part of the
     match. This seems wrong, so I have changed it.
     
-6.  If pcregrep was compiled under Windows, there was a reference to the 
+6.  Another pcregrep bug in multiline mode, when --colour was specified, caused
+    the check for further matches in the same line (so they could be coloured) 
+    to overrun the end of the current line. If another match was found, it was 
+    incorrectly shown (and then shown again when found in the next line).
+    
+7.  If pcregrep was compiled under Windows, there was a reference to the 
     function pcregrep_exit() before it was defined. I am assuming this was
     the cause of the "error C2371: 'pcregrep_exit' : redefinition;" that was 
     reported by a user. I've moved the definition above the reference.