From: <ez...@us...> - 2014-10-26 14:09:56
|
Revision: 23701 http://sourceforge.net/p/jedit/svn/23701 Author: ezust Date: 2014-10-26 14:09:49 +0000 (Sun, 26 Oct 2014) Log Message: ----------- Merge 23700 into 5.2.x Modified Paths: -------------- jEdit/branches/5.2.x/org/gjt/sp/jedit/EditPane.java Property Changed: ---------------- jEdit/branches/5.2.x/ Index: jEdit/branches/5.2.x =================================================================== --- jEdit/branches/5.2.x 2014-10-26 14:06:34 UTC (rev 23700) +++ jEdit/branches/5.2.x 2014-10-26 14:09:49 UTC (rev 23701) Property changes on: jEdit/branches/5.2.x ___________________________________________________________________ Modified: svn:mergeinfo ## -1,2 +1,2 ## /jEdit/branches/docking_framework:13128-13258 -/jEdit/trunk:23550-23567,23569,23625-23626,23636,23651,23654,23664,23677,23683 +/jEdit/trunk:23550-23567,23569,23625-23626,23636,23651,23654,23664,23677,23683,23700 \ No newline at end of property Modified: jEdit/branches/5.2.x/org/gjt/sp/jedit/EditPane.java =================================================================== --- jEdit/branches/5.2.x/org/gjt/sp/jedit/EditPane.java 2014-10-26 14:06:34 UTC (rev 23700) +++ jEdit/branches/5.2.x/org/gjt/sp/jedit/EditPane.java 2014-10-26 14:09:49 UTC (rev 23701) @@ -220,7 +220,7 @@ // This must happen after loadCaretInfo. // Otherwise caret is not restored properly. int check = jEdit.getIntegerProperty("checkFileStatus"); - if (jEdit.isStartupDone() && (check & GeneralOptionPane.checkFileStatus_focusBuffer) > 0); + if (jEdit.isStartupDone() && (check & GeneralOptionPane.checkFileStatus_focusBuffer) > 0) jEdit.checkBufferStatus(view, true); } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |