[ jEdit-commits ] SF.net SVN: jedit:[18693] jEdit/branches/4.3.x

[<jc...@us...>]

Revision: 18693
          http://jedit.svn.sourceforge.net/jedit/?rev=18693&view=rev
Author:   jchoyt
Date:     2010-09-30 23:53:52 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Reviewed and accepted merge req#3013714Fix add explicit fold in xml

Modified Paths:
--------------
    jEdit/branches/4.3.x/doc/CHANGES.txt
    jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java

Property Changed:
----------------
    jEdit/branches/4.3.x/


Property changes on: jEdit/branches/4.3.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /jEdit/branches/4.3.x-fix-view-leak:17061
/jEdit/branches/4.3.x-merge-request-2980833:17593
/jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16751,16754-16755,16805,16846,17145,17163,17219,17242,17388,17395,17408,17443,17479,17499,17545,17561-17562,17653,17723,17762,17836
   + /jEdit/branches/4.3.x-fix-view-leak:17061
/jEdit/branches/4.3.x-merge-request-2980833:17593
/jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16751,16754-16755,16805,16846,17145,17163,17219,17242,17388,17395,17408,17443,17479,17499,17545,17561-17562,17653,17723,17762,17836,18030

Modified: jEdit/branches/4.3.x/doc/CHANGES.txt
===================================================================
--- jEdit/branches/4.3.x/doc/CHANGES.txt	2010-09-30 23:43:55 UTC (rev 18692)
+++ jEdit/branches/4.3.x/doc/CHANGES.txt	2010-09-30 23:53:52 UTC (rev 18693)
@@ -7,6 +7,19 @@
 
 {{{ Bug Fixes
 
+- Fixed caret going to the wrong position when adding explicit folds
+  in a buffer that uses an edit mode that has no line comment
+  (Matthieu Casanova #2138160)
+  
+- When saving a buffer the autoreload option of the buffer was overridden
+  by global settings (Matthieu Casanova #2999966)
+
+- Improve indentation settings of the shellscript edit mode.
+  (Björn "Vampire" Kautler #3005463)
+
+- Removed the duplicated "Architecture" line from the Debian control file.
+  (Björn "Vampire" Kautler #2999456)
+
 - In the manage panel, when selecting a library, the description panel do
   not contains "null" for every fields and the title is set to the jar name
   instead of "null" (Matthieu Casanova)

Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java
===================================================================
--- jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java	2010-09-30 23:43:55 UTC (rev 18692)
+++ jEdit/branches/4.3.x/org/gjt/sp/jedit/textarea/TextArea.java	2010-09-30 23:53:52 UTC (rev 18693)
@@ -5854,7 +5854,7 @@
 		else if(startCommentStart != null && startCommentEnd != null)
 		{
 			start = startCommentStart + "{{{  " + startCommentEnd;
-			caretBack = 1 + startCommentStart.length();
+			caretBack = 2 + startCommentEnd.length();
 		}
 		else
 			start = "{{{ ";
@@ -5885,7 +5885,7 @@
 		String line = buffer.getLineText(lineStart);
 		String whitespace = line.substring(0,
 			StandardUtilities.getLeadingWhiteSpace(line));
-
+		caretBack += whitespace.length(); 
 		if (endLineComment != null)
 		{
 			// if we're inserting a line comment into a non-empty


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.