Updates for next release 3.2.1.

7 files changed, 130 insertions, 13 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index bd572d21b..e38bce05b 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/scintilla320.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla321.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla320.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla321.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.2.0
+       Release 3.2.1
     </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/scintilla320.zip?download">zip format</a> (1200K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla320.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla321.zip?download">zip format</a> (1200K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla321.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 47eca3936..53145b930 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -421,6 +421,122 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite321.zip?download">Release 3.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 July 2012.
+	</li>
+	<li>
+	In Scintilla.iface, specify features as properties instead of functions where possible and fix some enumerations.
+	</li>
+	<li>
+	In SciTE Lua scripts, string properties in Scintilla API can be retrieved as well as set using property notation.
+	</li>
+	<li>
+	Added character class APIs: SCI_SETPUNCTUATIONCHARS, SCI_GETWORDCHARS, SCI_GETWHITESPACECHARS,
+	and SCI_GETPUNCTUATIONCHARS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3529805&group_id=2439">Feature #3529805.</a>
+	</li>
+	<li>
+	Less/Hss support added to CSS lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3532413&group_id=2439">Feature #3532413.</a>
+	</li>
+	<li>
+	C++ lexer style SCE_C_PREPROCESSORCOMMENT added for stream comments in preprocessor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487406&group_id=2439">Bug #3487406.</a>
+	</li>
+	<li>
+	Fix incorrect styling of inactive code in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3533036&group_id=2439">Bug #3533036.</a>
+	</li>
+	<li>
+	Fix incorrect styling by C++ lexer after empty lines in preprocessor style.
+	</li>
+	<li>
+	C++ lexer option "lexer.cpp.allow.dollars" fixed so can be turned off after being on.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3541461&group_id=2439">Bug #3541461.</a>
+	</li>
+	<li>
+	Fortran fixed format lexer fixed to style comments from column 73.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran folder folds CRITICAL .. END CRITICAL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran lexer fixes styling after comment line ending with '&amp;'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3087226&group_id=2439">Bug #3087226.</a>
+	</li>
+	<li>
+	Fortran lexer styles preprocessor lines so they do not trigger incorrect folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2906275&group_id=2439">Bug #2906275.</a>
+	</li>
+	<li>
+	Fortran folder fixes folding of nested ifs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809176&group_id=2439">Bug #2809176.</a>
+	</li>
+	<li>
+	HTML folder fixes folding of CDATA when fold.html.preprocessor=0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540491&group_id=2439">Bug #3540491.</a>
+	</li>
+	<li>
+	On Cocoa, fix autocompletion font lifetime issue and row height computation.
+	</li>
+	<li>
+	In 'choose single' mode, autocompletion will close an existing list if asked to display a single entry list.
+	</li>
+	<li>
+	Fixed SCI_MARKERDELETE to only delete one marker per call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3535806&group_id=2439">Bug #3535806.</a>
+	</li>
+	<li>
+	Properly position caret after undoing coalesced delete operations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3523326&group_id=2439">Bug #3523326.</a>
+	</li>
+	<li>
+	Ensure margin is redrawn when SCI_MARGINSETSTYLE called.
+	</li>
+	<li>
+	Fix clicks in first pixel of margins to send SCN_MARGINCLICK.
+	</li>
+	<li>
+	Fix infinite loop when drawing block caret for a zero width space character at document start.
+	</li>
+	<li>
+	Crash fixed for deleting negative range.
+	</li>
+	<li>
+	For characters that overlap the beginning of their space such as italics descenders and bold serifs, allow start
+	of text to draw 1 pixel into margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=699587&group_id=2439">Bug #699587.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537799&group_id=2439">Bug #3537799.</a>
+	</li>
+	<li>
+	Fixed problems compiling Scintilla for Qt with GCC 4.7.1 x64.
+	</li>
+	<li>
+	Fixed problem with determining GTK+ sub-platform caused when adding Qt support in 3.2.0.
+	</li>
+	<li>
+	Fix incorrect measurement of untitled file in SciTE on Linux leading to message "File ...' is 2147483647 bytes long".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537764&group_id=2439">Bug #3537764.</a>
+	</li>
+	<li>
+	In SciTE, fix open of selected filename with line number to go to that line.
+	</li>
+	<li>
+	Fix problem with last visible buffer closing in SciTE causing invisible buffers to be active.
+	</li>
+	<li>
+	Avoid blinking of SciTE's current word highlight when output pane changes.
+	</li>
+	<li>
+	SciTE properties files can be longer than 60K.
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite320.zip?download">Release 3.2.0</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index efac4e5b0..f574509c3 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="20120601" />
+    <meta name="Date.Modified" content="20120715" />
     <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.2.0<br />
-           Site last modified June 1 2012</font>
+          <font color="#FFCC99" size="3"> Release version 3.2.1<br />
+           Site last modified July 15 2012</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.2.1 fixes minor bugs.</li>
       <li>Version 3.2.0 adds support for the Qt platform and PySide Python bindings.</li>
       <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>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index a749b51a2..0fe4114d3 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -10,7 +10,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.2.0
+VERSION = 3.2.1
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 668a3922e..5f0544fe0 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -10,7 +10,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.2.0
+VERSION = 3.2.1
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 18eed1357..3ae0b938f 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-320
+321
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 3195397c0..72a05f060 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.2.0"
-#define VERSION_WORDS 3, 2, 0, 0
+#define VERSION_SCINTILLA "3.2.1"
+#define VERSION_WORDS 3, 2, 1, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS