aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Tcl_shipped.html29
-rw-r--r--jim.c4
-rw-r--r--jim_tcl.txt12
3 files changed, 40 insertions, 5 deletions
diff --git a/Tcl_shipped.html b/Tcl_shipped.html
index dad3474..71bbbf5 100644
--- a/Tcl_shipped.html
+++ b/Tcl_shipped.html
@@ -1187,7 +1187,8 @@ Built-in regexp now support non-greedy repetition (*?, +?, ??)
<div class="sect1">
<h2 id="_tcl_introduction">TCL INTRODUCTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Tcl stands for <em>tool command language</em> and is pronounced <em>tickle.</em>
+<div class="paragraph"><p>Tcl stands for <em>tool command language</em> and is pronounced
+<em><a href="http://www.oxforddictionaries.com/definition/american_english/tickle">tickle</a></em>.
It is actually two things: a language and a library.</p></div>
<div class="paragraph"><p>First, Tcl is a simple textual language, intended primarily for
issuing commands to interactive programs such as text editors,
@@ -3525,6 +3526,30 @@ be removed in some applications.</p></div>
</p>
</dd>
<dt class="hdlist1">
+<code><strong>clock clicks</strong></code>
+</dt>
+<dd>
+<p>
+ Returns the current time in &#8216;clicks&#8217;.
+</p>
+</dd>
+<dt class="hdlist1">
+<code><strong>clock microseconds</strong></code>
+</dt>
+<dd>
+<p>
+ Returns the current time in microseconds.
+</p>
+</dd>
+<dt class="hdlist1">
+<code><strong>clock milliseconds</strong></code>
+</dt>
+<dd>
+<p>
+ Returns the current time in milliseconds.
+</p>
+</dd>
+<dt class="hdlist1">
<code><strong>clock format</strong> <em>seconds</em> ?<strong>-format</strong> <em>format?</em></code>
</dt>
<dd>
@@ -8241,7 +8266,7 @@ official policies, either expressed or implied, of the Jim Tcl Project.</code></
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-06-29 14:37:33 AEST
+Last updated 2015-07-09 08:26:33 EEST
</div>
</div>
</body>
diff --git a/jim.c b/jim.c
index 5b61a5d..8c72777 100644
--- a/jim.c
+++ b/jim.c
@@ -4295,7 +4295,7 @@ static int JimValidName(Jim_Interp *interp, const char *type, Jim_Obj *nameObjPt
/* This method should be called only by the variable API.
* It returns JIM_OK on success (variable already exists),
- * JIM_ERR if it does not exists, JIM_DICT_SUGAR if it's not
+ * JIM_ERR if it does not exist, JIM_DICT_SUGAR if it's not
* a variable name, but syntax glue for [dict] i.e. the last
* character is ')' */
static int SetVariableFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
@@ -12438,7 +12438,7 @@ static int Jim_LappendCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *
}
listObjPtr = Jim_GetVariable(interp, argv[1], JIM_UNSHARED);
if (!listObjPtr) {
- /* Create the list if it does not exists */
+ /* Create the list if it does not exist */
listObjPtr = Jim_NewListObj(interp, NULL, 0);
if (Jim_SetVariable(interp, argv[1], listObjPtr) != JIM_OK) {
Jim_FreeNewObj(interp, listObjPtr);
diff --git a/jim_tcl.txt b/jim_tcl.txt
index 13185c8..899e230 100644
--- a/jim_tcl.txt
+++ b/jim_tcl.txt
@@ -128,7 +128,8 @@ Changes between 0.70 and 0.71
TCL INTRODUCTION
-----------------
-Tcl stands for 'tool command language' and is pronounced 'tickle.'
+Tcl stands for 'tool command language' and is pronounced
+'http://www.oxforddictionaries.com/definition/american_english/tickle[tickle]'.
It is actually two things: a language and a library.
First, Tcl is a simple textual language, intended primarily for
@@ -1827,6 +1828,15 @@ clock
+*clock seconds*+::
Returns the current time as seconds since the epoch.
++*clock clicks*+::
+ Returns the current time in `clicks'.
+
++*clock microseconds*+::
+ Returns the current time in microseconds.
+
++*clock milliseconds*+::
+ Returns the current time in milliseconds.
+
+*clock format* 'seconds' ?*-format* 'format?'+::
Format the given time (seconds since the epoch) according to the given
format. See strftime(3) for supported formats.