summaryrefslogtreecommitdiffstats
path: root/generic/tkIcu.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-29 07:30:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-29 07:30:11 (GMT)
commit3c3e58351a1441181863aa015487e10307e5d6de (patch)
tree3081e6ad1f8efc367bce61bcd8ee5caa9a3c65fd /generic/tkIcu.c
parent2937446e0ba89de3f5f4cd81d6758999b3722193 (diff)
parent287ae817d18f64049ec3b37a0d233fec9117ed94 (diff)
downloadtk-3c3e58351a1441181863aa015487e10307e5d6de.zip
tk-3c3e58351a1441181863aa015487e10307e5d6de.tar.gz
tk-3c3e58351a1441181863aa015487e10307e5d6de.tar.bz2
Merge "enhanced-index" branch, so this TIP can make use of indices like "end-1"
Diffstat (limited to 'generic/tkIcu.c')
-rw-r--r--generic/tkIcu.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tkIcu.c b/generic/tkIcu.c
index 6f81c09..81ac460 100644
--- a/generic/tkIcu.c
+++ b/generic/tkIcu.c
@@ -141,18 +141,20 @@ startEndOfCmd(
if (flags & FLAG_FOLLOWING) {
idx = icu_next(it);
if (idx >= len) {
- idx = -1;
+ idx = TCL_INDEX_NONE;
}
} else {
idx = icu_previous(it);
}
} else if (idx == 0 && !(flags & FLAG_FOLLOWING)) {
- idx = -1;
+ idx = TCL_INDEX_NONE;
}
}
- Tcl_SetObjResult(interp, TkNewIndexObj(idx));
icu_close(it);
Tcl_DStringFree(&ds);
+ if (idx != TCL_INDEX_NONE) {
+ Tcl_SetObjResult(interp, TkNewIndexObj(idx));
+ }
return TCL_OK;
}