Revision: 20796
http://sourceforge.net/p/jmol/code/20796
Author: hansonr
Date: 2015-09-25 05:54:27 +0000 (Fri, 25 Sep 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.09.25"
bug fix: HBONDS DELETE broken since 14.1.2
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptEval.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-09-23 17:51:08 UTC
(rev 20795)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-09-25 05:54:27 UTC
(rev 20796)
@@ -621,8 +621,9 @@
boolean isTop) {
if (sb == null)
sb = new SB();
+ int pc = Math.min(sc.pc, sc.lineNumbers[sc.lineNumbers.length - 1]);
sb.append(getErrorLineMessage(sc.functionName, sc.scriptFileName,
- sc.lineNumbers[sc.pc], sc.pc, ScriptEval.statementAsString(vwr,
+ sc.lineNumbers[pc], pc, ScriptEval.statementAsString(vwr,
sc.statement, (isTop ? sc.iToken : 9999), false)));
if (sc.parentContext != null)
getContextTrace(vwr, sc.parentContext, sb, false);
@@ -2522,7 +2523,7 @@
case T.ramachandran:
case T.show:
case T.write:
- getCmdExt().dispatch(theToken.tok, false, st);
+ getCmdExt().dispatch(tok, false, st);
break;
default:
error(ERROR_unrecognizedCommand);
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-23 17:51:08 UTC
(rev 20795)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-25 05:54:27 UTC
(rev 20796)
@@ -61,8 +61,12 @@
TODO: consider if models with no atoms will cause issues in relation to
model.firstAtomIndex
-Jmol.___JmolVersion="14.3.16_2015.09.23"
+Jmol.___JmolVersion="14.3.16_2015.09.25"
+bug fix: HBONDS DELETE broken since 14.1.2
+
+JmolVersion="14.3.16_2015.09.23"
+
bug fix: within(0.0, {0 0 0}) fails when no atoms in model
JmolVersion="14.3.16_2015.09.22"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
