[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[24681] jEdit/trunk
From:       ezust () users ! sourceforge ! net
Date:       2017-05-31 4:02:07
Message-ID: 1496203327.657652.8242 () sfp-scm-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 24681
          http://sourceforge.net/p/jedit/svn/24681
Author:   ezust
Date:     2017-05-31 04:02:07 +0000 (Wed, 31 May 2017)
Log Message:
-----------
Resolve symbolic link paths before choosing the autosave directory. 

Modified Paths:
--------------
    jEdit/trunk/README.SRC.txt
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/doc/users-guide/files.xml
    jEdit/trunk/org/gjt/sp/jedit/Buffer.java
    jEdit/trunk/org/jedit/localization/jedit_en.props

Modified: jEdit/trunk/README.SRC.txt
===================================================================
--- jEdit/trunk/README.SRC.txt	2017-05-31 03:33:12 UTC (rev 24680)
+++ jEdit/trunk/README.SRC.txt	2017-05-31 04:02:07 UTC (rev 24681)
@@ -1,4 +1,5 @@
 SOURCE CODE NOTES
+asdf
 
 This file only contains information about compiling from source.
 Scroll to the bottom if you are trying to use an IDE like Eclipse.

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2017-05-31 03:33:12 UTC (rev 24680)
+++ jEdit/trunk/doc/CHANGES.txt	2017-05-31 04:02:07 UTC (rev 24681)
@@ -23,7 +23,7 @@
 - Removed Saving and Backup option, "Never mark untitled buffers dirty"
   because it has been replaced by "Autosave untitled buffers". (Alan Ezust)
 
-- FR#506: Option to change global autosave directory. (Alan Ezust)
+- FR#506: Autosaves are now saved to the Autosave/Backup directory. (Alan Ezust)
 
 }}}
 {{{ API Changes

Modified: jEdit/trunk/doc/users-guide/files.xml
===================================================================
--- jEdit/trunk/doc/users-guide/files.xml	2017-05-31 03:33:12 UTC (rev 24680)
+++ jEdit/trunk/doc/users-guide/files.xml	2017-05-31 04:02:07 UTC (rev 24681)
@@ -124,7 +124,7 @@
 
             <para> If you wish autosave files to be stored in an alternate
             location, you can specify the
-            <guilabel>Backup/Autosave Directory</guilabel>
+            <guilabel>Backup, Autosave Directory</guilabel>
             as a <guilabel>Saving and Backup</guilabel> option.
             When editing virtual file systems, this can improve performance
             and reduce unnecessary network traffic. </para>
@@ -178,7 +178,7 @@
                 </listitem>
 
                 <listitem>
-                    <para>If the <guilabel>Backup/Autosave directory</guilabel> \
setting +                    <para>If the <guilabel>Backup, Autosave \
                directory</guilabel> setting
                     is non-empty, backups are saved in that location (with the
                     full path to the original file under it). Otherwise,
                     they are saved in the same directory as the original file.

Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2017-05-31 03:33:12 UTC (rev 24680)
+++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java	2017-05-31 04:02:07 UTC (rev 24681)
@@ -1913,9 +1913,9 @@
 
 		if(vfs instanceof FileVFS)
 		{
-			file = new File(path);
+			
 			symlinkPath = MiscUtilities.resolveSymlinks(path);
-
+			file = new File(symlinkPath);
 			// if we don't do this, the autosave file won't be
 			// deleted after a save as
 			if(autosaveFile != null)
@@ -1923,7 +1923,7 @@
 			String dirName = file.getParent();
 			String autosaveDir = jEdit.getProperty("backup.directory");
 			if (autosaveDir != null && !autosaveDir.isEmpty()) {
-				dirName = MiscUtilities.concatPath(autosaveDir, file.getParent());
+				dirName = MiscUtilities.concatPath(autosaveDir, dirName);
 				File asDir = new File(dirName);
 				if (!asDir.exists())
 					asDir.mkdirs();

Modified: jEdit/trunk/org/jedit/localization/jedit_en.props
===================================================================
--- jEdit/trunk/org/jedit/localization/jedit_en.props	2017-05-31 03:33:12 UTC (rev \
                24680)
+++ jEdit/trunk/org/jedit/localization/jedit_en.props	2017-05-31 04:02:07 UTC (rev \
24681) @@ -1685,7 +1685,7 @@
 options.save-back.label=Saving & Backup
 options.save-back.autosave=Autosave frequency (secs):
 options.save-back.backups=Max number of backups:
-options.save-back.backupDirectory=Backup/Autosave directory:
+options.save-back.backupDirectory=Backup, Autosave directory:
 options.save-back.backupPrefix=Backup filename prefix:
 options.save-back.backupSuffix=Backup filename suffix:
 options.save-back.backupEverySave=Backup on every save

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


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]