merged trunk

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/textIndex.test b/tests/textIndex.test
index c949b1f..83a249e 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -905,6 +905,21 @@ test textIndex-22.12 {text index wordstart, unicode} {
 test textIndex-22.13 {text index wordstart, unicode} {
     text_test_word wordstart "\uc700\uc700 abc" 8
 } 3
+test textIndex-22.14 {text index wordstart, unicode, start index at internal segment start} {
+    catch {destroy .t}
+    text .t
+    .t insert end "C'est du texte en fran\u00e7ais\n"
+    .t insert end "\u042D\u0442\u043E\u0020\u0442\u0435\u043A\u0441\u0442\u0020\u043D\u0430\u0020\u0440\u0443\u0441\u0441\u043A\u043E\u043C"
+    .t mark set insert 1.23
+    set res [.t index "1.23 wordstart"]
+    .t mark set insert 2.16
+    lappend res [.t index "2.16 wordstart"] [.t index "2.15 wordstart"]
+} {1.18 2.13 2.13}
+test textIndex-22.15 {text index display wordstart} {
+    catch {destroy .t}
+    text .t
+    .t index "1.0 display wordstart"  ; # used to crash
+} 1.0
 
 test textIndex-23.1 {text paragraph start} {
     pack [text .t2]
@@ -928,6 +943,19 @@ test textIndex-24.1 {text mark prev} {
     set res
 } {1.0}
 
+test textIndex-25.1 {IndexCountBytesOrdered, bug [3f1f79abcf]} {
+    pack [text .t2]
+    .t2 tag configure elided -elide 1
+    .t2 insert end "01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n"
+    .t2 insert end "11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n"
+    .t2 insert end "21\n22\n23\n25\n26\n27\n28\n29\n30\n31"
+    .t2 insert end "32\n33\n34\n36\n37\n38\n39" elided
+    # then this used to crash Tk:
+    .t2 see end
+    focus -force .t2   ; # to see the cursor blink
+    destroy .t2
+} {}
+
 # cleanup
 rename textimage {}
 catch {destroy .t}