Updates for 2.22 release.

6 files changed, 118 insertions, 17 deletions

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 2cd53f3aa..c32a37b56 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -4295,6 +4295,8 @@ struct Sci_TextToFind {
         <tr>
           <td><code>SCI_SELECTIONDUPLICATE</code></td>
 
+          <td><code>SCI_VERTICALCENTRECARET</code></td>
+
         </tr>
      </tbody>
     </table>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 7cad83063..18508dc87 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/scintilla221.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla222.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla221.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla222.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 2.21
+       Release 2.22
     </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/scintilla221.zip?download">zip format</a> (1160K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla221.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla222.zip?download">zip format</a> (1160K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla222.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 13ab7954b..768301c69 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -369,6 +369,108 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite222.zip?download">Release 2.22</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 October 2010.
+	</li>
+	<li>
+	SciTE includes support for integrating with Scintillua which allows lexers to be implemented in Lua as a
+	Parsing Expression Grammar (PEG).
+	</li>
+	<li>
+	Regular expressions allow use of '?' for non-greedy matches or to match 0 or 1 instances of an item.
+	</li>
+	<li>
+	SCI_CONTRACTEDFOLDNEXT added to allow rapid retrieval of folding state.
+	</li>
+	<li>
+	SCN_HOTSPOTRELEASECLICK notification added which is similar to SCN_HOTSPOTCLICK but occurs
+	when the mouse is released.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3082409&group_id=2439">Feature #3082409.</a>
+	</li>
+	<li>
+	Command added for centring current line in window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3064696&group_id=2439">Feature #3064696.</a>
+	</li>
+	<li>
+	SciTE performance improved by not examining document for line ends when switching buffers and not
+	storing folds when folding turned off.
+	</li>
+	<li>
+	Bug fixed where scrolling to ensure the caret is visible did not take into account all pixels of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081721&group_id=2439">Bug #3081721.</a>
+	</li>
+	<li>
+	Bug fixed for autocompletion list overlaping text when WS_EX_CLIENTEDGE used.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079778&group_id=2439">Bug #3079778.</a>
+	</li>
+	<li>
+	After autocompletion, the caret's X is updated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079114&group_id=2439">Bug #3079114.</a>
+	</li>
+	<li>
+	On Windows, default to the system caret blink time.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3079784&group_id=2439">Feature #3079784.</a>
+	</li>
+	<li>
+	PgUp/PgDn fixed to allow virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3077452&group_id=2439">Bug #3077452.</a>
+	</li>
+	<li>
+	Crash fixed when AddMark and AddMarkSet called with negative argument.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3075074&group_id=2439">Bug #3075074.</a>
+	</li>
+	<li>
+	Dwell notifications fixed so that they do not occur when the mouse is outside Scintilla.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3073481&group_id=2439">Bug #3073481.</a>
+	</li>
+	<li>
+	C++ lexer bug fixed for // comments that are continued onto a second line by a \.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3066031&group_id=2439">Bug #3066031.</a>
+	</li>
+	<li>
+	C++ lexer fixes wrong highlighting for float literals containing +/-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058924&group_id=2439">Bug #3058924.</a>
+	</li>
+	<li>
+	JavaScript lexer recognize regexes following return keyword.‎
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3062287&group_id=2439">Bug #3062287.</a>
+	</li>
+	<li>
+	Ruby lexer handles % quoting better and treats range dots as operators in 1..2 and 1...2.
+	Ruby folder handles "if" keyword used as a modifier even when it is separated from the modified statement by an escaped new line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2093767&group_id=2439">Bug #2093767.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058496&group_id=2439">Bug #3058496.</a>
+	</li>
+	<li>
+	Bug fixed where upwards search failed with DBCS code pages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3065912&group_id=2439">Bug #3065912.</a>
+	</li>
+	<li>
+	SciTE has a default Lua startup script name distributed in SciTEGlobal.properties.
+	No error message is displayed if this file does not exist.
+	</li>
+	<li>
+	SciTE on Windows tab control height is calculated better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635702&group_id=2439">Bug #2635702.</a>
+	</li>
+	<li>
+	SciTE on Windows uses better themed check buttons in find and replace strips.
+	</li>
+	<li>
+	SciTE on Windows fixes bug with Find strip appearing along with Incremental Find strip.
+	</li>
+	<li>
+	SciTE setting find.close.on.find added to allow preventing the Find dialog from closing.
+	</li>
+	<li>
+	SciTE on Windows attempts to rerun commands that fail by prepending them with "cmd.exe /c".
+	This allows commands built in to the command processor like "dir" to run.
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite221.zip?download">Release 2.21</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index 01919f330..d3dc91ec3 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="20100901" />
+    <meta name="Date.Modified" content="20101027" />
     <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 2.21<br />
-           Site last modified September 1 2010</font>
+          <font color="#FFCC99" size="3"> Release version 2.22<br />
+           Site last modified October 27 2010</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,13 +71,10 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 2.22 fixes bugs and adds minor improvements.</li>
       <li>Version 2.21 performs much faster for Asian Double Byte Character Sets.</li>
       <li>Version 2.20 implements lexers as objects so they may retain additional state.
       The C++ lexer understands the preprocessor enough to grey-out code that is inactive due to conditional compilation.</li>
-      <li>Version 2.12 improves drawing speed and fixes bugs.</li>
-      <li>Version 2.11 fixes compatibility with the C language.</li>
-      <li>Version 2.10 performs case insensitive search and upper and lower casing for non-ASCII characters.
-      Support for version 1.x of GTK+ removed.</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 7b473380d..c200906ef 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-221
+222
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index b04cfdb24..e097b41a0 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -9,8 +9,8 @@
 #include "PlatformRes.h"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	2, 2, 1, 0
-PRODUCTVERSION	2, 2, 1, 0
+FILEVERSION	2, 2, 2, 0
+PRODUCTVERSION	2, 2, 2, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
 FILEOS VOS_NT_WINDOWS32
@@ -27,12 +27,12 @@ BEGIN
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
-			VALUE	"FileVersion",	"2.21\0"
+			VALUE	"FileVersion",	"2.22\0"
 			VALUE	"InternalName",	"Scintilla\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2010 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
 			VALUE	"ProductName",	"Scintilla\0"
-			VALUE	"ProductVersion",	"2.21\0"
+			VALUE	"ProductVersion",	"2.22\0"
 		END
 	END
 END