From: <dal...@us...> - 2015-09-17 18:38:18
|
Revision: 24080 http://sourceforge.net/p/jedit/svn/24080 Author: daleanson Date: 2015-09-17 18:38:16 +0000 (Thu, 17 Sep 2015) Log Message: ----------- Next attempt to fix 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-16 21:28:44 UTC (rev 24079) +++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2015-09-17 18:38:16 UTC (rev 24080) @@ -443,7 +443,8 @@ GUIUtilities.error(view,"buffer-multiple-io",null); return false; } - + view.getEditPane().saveCaretInfo(); + setBooleanProperty(BufferIORequest.ERROR_OCCURRED,false); if(path == null && getFlag(NEW_FILE)) Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2015-09-16 21:28:44 UTC (rev 24079) +++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2015-09-17 18:38:16 UTC (rev 24080) @@ -4848,9 +4848,6 @@ if(buffer == null) return; - final int caretPosition = buffer.getIntegerProperty(Buffer.CARET, getCaretPosition()); - final int hbarPosition = horizontal.getValue(); - if(buffer.getBooleanProperty("elasticTabstops")) { //call this only if it was previously off @@ -4911,14 +4908,9 @@ { public void run() { - if (hbarPosition >= horizontal.getMinimum() && hbarPosition <= horizontal.getMaximum()) - { - horizontal.setValue(hbarPosition); - } - if (caretPosition >= 0 && caretPosition < buffer.getLength()) - { - setCaretPosition(caretPosition); - } + int caret = buffer.getIntegerProperty(Buffer.CARET, 0); + if(caret != -1) + setCaretPosition(Math.min(caret, buffer.getLength())); } }); } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |