[ jEdit-commits ] SF.net SVN: jedit:[24087] jEdit/trunk/org/gjt/sp/jedit

[<dal...@us...>]

Revision: 24087
          http://sourceforge.net/p/jedit/svn/24087
Author:   daleanson
Date:     2015-09-19 20:56:09 +0000 (Sat, 19 Sep 2015)
Log Message:
-----------
Reverted changes made for 3911 and 3928.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/Buffer.java
    jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java

Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2015-09-17 18:45:55 UTC (rev 24086)
+++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2015-09-19 20:56:09 UTC (rev 24087)
@@ -443,7 +443,6 @@
 			GUIUtilities.error(view,"buffer-multiple-io",null);
 			return false;
 		}
-		view.getEditPane().saveCaretInfo();
 		
 		setBooleanProperty(BufferIORequest.ERROR_OCCURRED,false);
 

Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java	2015-09-17 18:45:55 UTC (rev 24086)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java	2015-09-19 20:56:09 UTC (rev 24087)
@@ -43,7 +43,6 @@
 import javax.swing.text.Segment;
 import javax.swing.text.TabExpander;
 
-import org.gjt.sp.jedit.Buffer;
 import org.gjt.sp.jedit.Debug;
 import org.gjt.sp.jedit.IPropertyManager;
 import org.gjt.sp.jedit.JEditActionContext;
@@ -4902,17 +4901,6 @@
 		chunkCache.reset();
 		gutter.repaint();
 		painter.repaint();
-		
-		// reset the horizontal scrollbar and caret
-		SwingUtilities.invokeLater(new Runnable()
-		{
-			public void run()
-			{
-				int caret = buffer.getIntegerProperty(Buffer.CARET, 0);
-				if(caret != -1)
-					setCaretPosition(Math.min(caret, buffer.getLength()));
-			}
-		});
 	} //}}}
 
 	//{{{ addActionSet() method

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