Merge

7 files changed, 136 insertions, 12 deletions

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 242f3788d..2e8406ba6 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -79,7 +79,7 @@
 
     <h1>Scintilla Documentation</h1>
 
-    <p>Last edited 4/December/2011 NH</p>
+    <p>Last edited 24/January/2012 NH</p>
 
     <p>There is <a class="jump" href="Design.html">an overview of the internal design of
     Scintilla</a>.<br />
@@ -3065,6 +3065,8 @@ struct Sci_TextToFind {
     On most platforms, the only choice is <code>SC_TECHNOLOGY_DEFAULT</code> (0).
     On Windows Vista or later, <code>SC_TECHNOLOGY_DIRECTWRITE</code> (1)
     can be chosen to use the Direct2D and DirectWrite APIs for higher quality antialiased drawing.</p>
+    <p>Since Direct2D buffers drawing, Scintilla's buffering should be turned off with
+    <code>SCI_SETBUFFEREDDRAW(0);</code>. This causes DirectWrite to use better quality antialiasing.</p>
 
     <p><b id="SCI_SETFONTQUALITY">SCI_SETFONTQUALITY(int fontQuality)</b><br />
      <b id="SCI_GETFONTQUALITY">SCI_GETFONTQUALITY</b><br />
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 4d542dcfe..1c1c033ca 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/scintilla302.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla302.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.0.2
+       Release 3.0.3
     </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/scintilla302.zip?download">zip format</a> (1200K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla302.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.zip?download">zip format</a> (1200K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla303.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 11a099606..92f9db284 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -390,6 +390,8 @@
 	<td>Stefan Weil</td>
 	<td>Rex Conn</td>
 	<td>Ross McKay</td>
+      </tr><tr>
+	<td>Bruno Barbieri</td>
     </tr>
     </table>
     <p>
@@ -402,6 +404,122 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite303.zip?download">Release 3.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 January 2012.
+	</li>
+	<li>
+	Printing works on GTK+ version 2.x as well as 3.x.
+	</li>
+	<li>
+	Lexer added for the AviSynth language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3475611&group_id=2439">Feature #3475611.</a>
+	</li>
+	<li>
+	Lexer added for the Take Command / TCC scripting language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3462462&group_id=2439">Feature #3462462.</a>
+	</li>
+	<li>
+	CSS lexer gains support for SCSS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3268017&group_id=2439">Feature #3268017.</a>
+	</li>
+	<li>
+	CPP lexer fixes problems in the preprocessor structure caused by continuation lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3458508&group_id=2439">Bug #3458508.</a>
+	</li>
+	<li>
+	Errorlist lexer handles column numbers for GCC format diagnostics.
+	In SciTE, Next Message goes to column where this can be decoded from GCC format diagnostics.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3453075&group_id=2439">Feature #3453075.</a>
+	</li>
+	<li>
+	HTML folder fixes spurious folds on some tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459262&group_id=2439">Bug #3459262.</a>
+	</li>
+	<li>
+	Ruby lexer fixes bug where '=' at start of file caused whole file to appear as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3452488&group_id=2439">Bug #3452488.</a>
+	</li>
+	<li>
+	SQL folder folds blocks of single line comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3467425&group_id=2439">Feature #3467425.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, defer invalidation of render target until completion of painting to avoid failures.
+	</li>
+	<li>
+	Further support of fractional positioning. Spaces, tabs, and single character tokens can take fractional space
+	and wrapped lines are positioned taking fractional positions into account.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, fix extra carets appearing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	For autocompletion lists Page Up and Down move by the list height instead of by 5 lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3455493&group_id=2439">Bug #3455493.</a>
+	</li>
+	<li>
+	For SCI_LINESCROLLDOWN/UP don't select into virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3451681&group_id=2439">Bug #3451681.</a>
+	</li>
+	<li>
+	Fix fold highlight not being fully drawn.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469936&group_id=2439">Bug #3469936.</a>
+	</li>
+	<li>
+	Fix selection margin appearing black when starting in wrap mode.
+	</li>
+	<li>
+	Fix crash when changing end of document after adding an annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476637&group_id=2439">Bug #3476637.</a>
+	</li>
+	<li>
+	Fix problems with building to make RPMs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476149&group_id=2439">Bug #3476149.</a>
+	</li>
+	<li>
+	Fix problem with building on GTK+ where recent distributions could not find gmodule.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469056&group_id=2439">Bug #3469056.</a>
+	</li>
+	<li>
+	Fix problem with installing SciTE on GTK+ due to icon definition in .desktop file including an extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476117&group_id=2439">Bug #3476117.</a>
+	</li>
+	<li>
+	Fix SciTE bug where new buffers inherited some properties from previously opened file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3457060&group_id=2439">Bug #3457060.</a>
+	</li>
+	<li>
+	Fix focus when closing tab in SciTE with middle click. Focus moves to edit pane instead of staying on tab bar.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix bug where Open Selected Filename for URL would append a file extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3459185&group_id=2439">Feature #3459185.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix key handling of control characters in Parameters dialog so normal editing (Ctrl+C, ...) works.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459345&group_id=2439">Bug #3459345.</a>
+	</li>
+	<li>
+	Fix SciTE bug where files became read-only after saving. Drop the "*" dirty marker after save completes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467432&group_id=2439">Bug #3467432.</a>
+	</li>
+	<li>
+	For SciTE handling of diffs with "+++" and "---" lines, also handle case where not followed by tab.
+	Go to correct line for diff "+++" message.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467143&group_id=2439">Bug #3467143.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467178&group_id=2439">Bug #3467178.</a>
+	</li>
+	<li>
+	SciTE on GTK+ now performs threaded actions even on GTK+ versions before 2.12.
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite302.zip?download">Release 3.0.2</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index 60eb8d949..16de9f3c0 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="20111209" />
+    <meta name="Date.Modified" content="20120130" />
     <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.2<br />
-           Site last modified December 9 2011</font>
+          <font color="#FFCC99" size="3"> Release version 3.0.3<br />
+           Site last modified January 30 2012</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.0.3 uses fractional positioning in more situations.</li>
       <li>Version 3.0.2 fixes bugs.</li>
       <li>Version 3.0.1 fixes bugs, most notably display bugs on Windows.</li>
       <li>Version 3.0.0 has changed the platforms supported.
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 4fce8bb2d..26032b85f 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4643,7 +4643,7 @@ void Editor::NotifyModified(Document *, DocModification mh, void *) {
 		if ((!willRedrawAll) && ((paintState == notPainting) || !PaintContainsMargin())) {
 			if (mh.modificationType & SC_MOD_CHANGEFOLD) {
 				// Fold changes can affect the drawing of following lines so redraw whole margin
-				RedrawSelMargin(mh.line-1, true);
+				RedrawSelMargin(highlightDelimiter.isEnabled ? -1 : mh.line-1, true);
 			} else {
 				RedrawSelMargin(mh.line);
 			}
@@ -6701,7 +6701,7 @@ void Editor::SetBraceHighlight(Position pos0, Position pos1, int matchStyle) {
 void Editor::SetAnnotationHeights(int start, int end) {
 	if (vs.annotationVisible) {
 		bool changedHeight = false;
-		for (int line=start; line<end; line++) {
+		for (int line=start; line<end && line<pdoc->LinesTotal(); line++) {
 			int linesWrapped = 1;
 			if (wrapState != eWrapNone) {
 				AutoSurface surface(this);
diff --git a/version.txt b/version.txt
index 274f7143b..81606223f 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-302
+303
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 35f2044fc..92dd32ffc 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -435,6 +435,9 @@ void ScintillaWin::EnsureRenderTarget() {
 			D2D1::HwndRenderTargetProperties(hw, size),
 			&pRenderTarget);
 #endif
+		// Pixmaps were created to be compatible with previous render target so
+		// need to be recreated.
+		DropGraphics(false);
 	}
 #endif
 }