summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCmdIL.c4
-rw-r--r--tests/cmdIL.test4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b94992..a8e8c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-15 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+
+ * generic/tclCmdIL.c (SortCompare): Cleared up confusing error
+ message. [Bug 771539]
+
2003-07-11 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* tests/binary.test (binary-46.*): Tests to help enforce the
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index a7f7fc0..89c05af 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCmdIL.c,v 1.50 2003/04/29 20:23:38 dgp Exp $
+ * RCS: @(#) $Id: tclCmdIL.c,v 1.51 2003/07/15 15:42:05 dkf Exp $
*/
#include "tclInt.h"
@@ -3703,7 +3703,7 @@ SortCompare(objPtr1, objPtr2, infoPtr)
Tcl_GetObjResult(infoPtr->interp), &order) != TCL_OK) {
Tcl_ResetResult(infoPtr->interp);
Tcl_AppendToObj(Tcl_GetObjResult(infoPtr->interp),
- "-compare command returned non-numeric result", -1);
+ "-compare command returned non-integer result", -1);
infoPtr->resultCode = TCL_ERROR;
return order;
}
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
index 694abbd..01094b1 100644
--- a/tests/cmdIL.test
+++ b/tests/cmdIL.test
@@ -8,7 +8,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: cmdIL.test,v 1.14 2001/09/28 15:32:17 dkf Exp $
+# RCS: @(#) $Id: cmdIL.test,v 1.15 2003/07/15 15:42:05 dkf Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -207,7 +207,7 @@ test cmdIL-3.17 {SortCompare procedure, -command option, non-integer result} {
return foow
}
list [catch {lsort -command cmp {48 6}} msg] $msg
-} {1 {-compare command returned non-numeric result}}
+} {1 {-compare command returned non-integer result}}
test cmdIL-3.18 {SortCompare procedure, -command option} {
proc cmp {a b} {
expr {$b - $a}