Preparing 3.1.0 release.

5 files changed, 103 insertions, 15 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 973611fce..a17e36e08 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -25,9 +25,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla310.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla310.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.0.3
+       Release 3.1.0
     </h3>
     <h4>
        Source Code
@@ -49,8 +49,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.zip?download">zip format</a> (1200K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla304.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla310.zip?download">zip format</a> (1200K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla310.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 8276a7b68..f2e44da33 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -411,6 +411,95 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite310.zip?download">Release 3.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 April 2012.
+	</li>
+	<li>
+	Animated find indicator added on Cocoa.
+	</li>
+	<li>
+	Buttons can be made default in SciTE user strips.
+	</li>
+	<li>
+	SciTE allows find and replace histories to be saved in session.
+	</li>
+	<li>
+	Option added to allow case-insensitive selection in auto-completion lists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3516538&group_id=2439">Bug #3516538.</a>
+	</li>
+	<li>
+	Replace \0 by complete found text in regular expressions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3510979&group_id=2439">Feature #3510979.</a>
+	</li>
+	<li>
+	Fixed single quoted strings in bash lexer. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	</li>
+	<li>
+	Incorrect highlighting fixed in C++ lexer for continued lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3509317&group_id=2439">Bug #3509317.</a>
+	</li>
+	<li>
+	Hang fixed in diff lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3508602&group_id=2439">Bug #3508602.</a>
+	</li>
+	<li>
+	Folding improved for SQL CASE/MERGE statement.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3503277&group_id=2439">Bug #3503277.</a>
+	</li>
+	<li>
+	Fix extra drawing of selection inside word wrap indentation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515555&group_id=2439">Bug #3515555.</a>
+	</li>
+	<li>
+	Fix problem with determining the last line that needs styling when drawing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix problems with drawing in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix printing crash when using Direct2D to display on-screen. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3513946&group_id=2439">Bug #3513946.</a>
+	</li>
+	<li>
+	Fix SciTE bug where background.*.size disabled restoration of bookmarks and positions from session.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514885&group_id=2439">Bug #3514885.</a>
+	</li>
+	<li>
+	Fixed the Move Selected Lines command when last line does not end with a line end character. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3511023&group_id=2439">Bug #3511023.</a>
+	</li>
+	<li>
+	Fix word wrap indentation printing to use printer settings instead of screen settings. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512961&group_id=2439">Bug #3512961.</a>
+	</li>
+	<li>
+	Fix SciTE bug where executing an empty command prevented executing further commands 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512976&group_id=2439">Bug #3512976.</a>
+	</li>
+	<li>
+	Suppress SciTE regular expression option when searching with find next selection. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3510985&group_id=2439">Bug #3510985.</a>
+	</li>
+	<li>
+	SciTE Find in Files command matches empty pattern to all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495918&group_id=2439">Feature #3495918.</a>
+	</li>
+	<li>
+	Fix scroll with mouse wheel on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3501321&group_id=2439">Bug #3501321.</a>
+	</li>
+	<li>
+	Fix column finding method so that tab is counted correctly. 
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3483713&group_id=2439">Bug #3483713.</a>
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite304.zip?download">Release 3.0.4</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index 9c7dd0390..528289e6b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20120308" />
+    <meta name="Date.Modified" content="20120420" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.0.4<br />
-           Site last modified March 8 2012</font>
+          <font color="#FFCC99" size="3"> Release version 3.1.0<br />
+           Site last modified April 20 2012</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.1.0 adds an animated find indicator on Cocoa.</li>
       <li>Version 3.0.4 fixes minor problems particularly with Direct2D.</li>
       <li>Version 3.0.3 uses fractional positioning in more situations.</li>
       <li>Version 3.0.2 fixes bugs.</li>
@@ -81,8 +82,6 @@
       For GTK+ all drawing is performed with Cairo as GDK drawing removed.
       Palette support removed.
       Font size and weight can be specified with more precision.</li>
-      <li>Version 2.28 allows translucent images in RGBA format to be used for margin markers and in autocompletion lists.</li>
-      <li>Version 2.27 fixes incorrect colours on some versions of GTK+.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/version.txt b/version.txt
index 873b744bc..54ea97e96 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-304
+310
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 3305fd8d7..3295609a2 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -5,8 +5,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	3, 0, 4, 0
-PRODUCTVERSION	3, 0, 4, 0
+FILEVERSION	3, 1, 0, 0
+PRODUCTVERSION	3, 1, 0, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
 FILEOS VOS_NT_WINDOWS32
@@ -23,12 +23,12 @@ BEGIN
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
-			VALUE	"FileVersion",	"3.0.4\0"
+			VALUE	"FileVersion",	"3.1.0\0"
 			VALUE	"InternalName",	"Scintilla\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2012 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
 			VALUE	"ProductName",	"Scintilla\0"
-			VALUE	"ProductVersion",	"3.0.4\0"
+			VALUE	"ProductVersion",	"3.1.0\0"
 		END
 	END
 END