From: <ez...@us...> - 2012-08-28 03:11:28
|
Revision: 22086 http://jedit.svn.sourceforge.net/jedit/?rev=22086&view=rev Author: ezust Date: 2012-08-28 03:11:21 +0000 (Tue, 28 Aug 2012) Log Message: ----------- #3562315 cont'd: if user has "do nothing" for "if files are changed on disk" option, then don't popup that dialog asking user to reload, just ignore the fact that it was changed. Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/Buffer.java Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2012-08-28 02:40:18 UTC (rev 22085) +++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2012-08-28 03:11:21 UTC (rev 22086) @@ -454,7 +454,7 @@ { long newModTime = file.lastModified(); - if(newModTime != modTime) + if((newModTime != modTime) && (jEdit.getBooleanProperty("autoReload") || jEdit.getBooleanProperty("autoReloadDialog"))) { Object[] args = { this.path }; int result = GUIUtilities.confirm(view, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |