Revision: 21270
          http://sourceforge.net/p/jmol/code/21270
Author:   hansonr
Date:     2016-10-19 04:54:45 +0000 (Wed, 19 Oct 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.6.4_2016.10.17"

bug fix: load "@x" not saved in state properly
bug fix: IDTF exporter broken in Jmol 14.6.4_2016.10.02

Modified Paths:
--------------
    branches/v14_6/Jmol/src/org/jmol/script/ScriptEval.java
    branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/jmol/script/ScriptEval.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v14_6/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/script/ScriptEval.java     2016-10-18 
04:02:03 UTC (rev 21269)
+++ branches/v14_6/Jmol/src/org/jmol/script/ScriptEval.java     2016-10-19 
04:54:45 UTC (rev 21270)
@@ -4601,7 +4601,7 @@
 
       loadScript.append(" ");
       if (isVariable || isInline) {
-        loadScript.append(filename.indexOf('\n') >= 0 ? PT.esc(filename) : 
filename);
+        loadScript.append(filename.indexOf('\n') >= 0 || isVariable ? 
PT.esc(filename) : filename);
       } else if (!isData) {
         if (localName != null)
           localName = vwr.fm.getFilePath(localName, false, false);

Modified: branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties     2016-10-18 
04:02:03 UTC (rev 21269)
+++ branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties     2016-10-19 
04:54:45 UTC (rev 21270)
@@ -9,6 +9,7 @@
 
 Jmol.___JmolVersion="14.6.4_2016.10.17"
 
+bug fix: load "@x" not saved in state properly
 bug fix: IDTF exporter broken in Jmol 14.6.4_2016.10.02
 
 JmolVersion="14.6.4_2016.10.15"

Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java      2016-10-18 04:02:03 UTC 
(rev 21269)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java      2016-10-19 04:54:45 UTC 
(rev 21270)
@@ -4601,7 +4601,7 @@
 
       loadScript.append(" ");
       if (isVariable || isInline) {
-        loadScript.append(filename.indexOf('\n') >= 0 ? PT.esc(filename) : 
filename);
+        loadScript.append(filename.indexOf('\n') >= 0 || isVariable ? 
PT.esc(filename) : filename);
       } else if (!isData) {
         if (localName != null)
           localName = vwr.fm.getFilePath(localName, false, false);

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-10-18 04:02:03 UTC 
(rev 21269)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-10-19 04:54:45 UTC 
(rev 21270)
@@ -49,6 +49,7 @@
 
 Jmol.___JmolVersion="14.7.4_2016.10.17"
 
+bug fix: load "@x" not saved in state properly
 bug fix: IDTF exporter broken in Jmol 14.7.4_2016.10.02
 
 JmolVersion="14.7.4_2016.10.15"

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
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to