summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclClock.c4
-rw-r--r--tests/clock.test5
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 82990c3..6fed1b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * generic/tclClock.c (Tcl_ClockObjCmd): Minor fault in a [clock
+ clicks] error message.
+
2004-04-07 Jeff Hobbs <jeffh@ActiveState.com>
* win/tclWinInit.c (TclpSetInitialEncodings): note that WIN32_CE
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 2105d21..6d23006 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclClock.c,v 1.26 2004/04/06 22:25:48 dgp Exp $
+ * RCS: @(#) $Id: tclClock.c,v 1.27 2004/04/15 21:06:39 dkf Exp $
*/
#include "tclInt.h"
@@ -101,7 +101,7 @@ Tcl_ClockObjCmd (client, interp, objc, objv)
return TCL_ERROR;
}
} else if (objc != 2) {
- Tcl_WrongNumArgs(interp, 2, objv, "?-milliseconds?");
+ Tcl_WrongNumArgs(interp, 2, objv, "?option?");
return TCL_ERROR;
}
switch (clickType) {
diff --git a/tests/clock.test b/tests/clock.test
index 08818d7..ea7310e 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: clock.test,v 1.24 2004/03/10 16:01:26 kennykb Exp $
+# RCS: @(#) $Id: clock.test,v 1.25 2004/04/15 21:06:39 dkf Exp $
set env(LC_TIME) POSIX
@@ -98,6 +98,9 @@ test clock-2.11 {clock clicks test, millis align with micros} {
expr { $t2 / 1000 == $t3 }
} {1}
+test clock-2.12 {clock clicks test, wrong num args} {
+ list [catch {clock clicks foo bar} msg] $msg
+} {1 {wrong # args: should be "clock clicks ?option?"}}
# clock format
test clock-3.1 {clock format tests} {unixOnly} {