Simplify some TIP #621 procs, since it's Tcl counterparts can (now) handle indices like "end-1"

1 files changed, 0 insertions, 14 deletions

diff --git a/library/tk.tcl b/library/tk.tcl
index ca58b6f..a9db88c 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -744,8 +744,6 @@ if {[info commands ::tk::startOfNextWord] eq ""} {
     proc ::tk::startOfNextWord {str start {locale {}}} {
 	if {$start < 0} {
 	    set start -1
-	} elseif {[string match end-* $start]} {
-	    set start [expr {[string length $str]-1-[string range $start 4 end]}]
 	}
 	set start [tcl_startOfNextWord $str $start]
 	if {$start < 0} {
@@ -758,8 +756,6 @@ if {[info commands ::tk::startOfPreviousWord] eq ""} {
     proc ::tk::startOfPreviousWord {str start {locale {}}} {
 	if {$start < 0} {
 	    set start -1
-	} elseif {[string match end-* $start]} {
-	    set start [expr {[string length $str]-1-[string range $start 4 end]}]
 	}
 	set start [tcl_startOfPreviousWord $str $start]
 	if {$start < 0} {
@@ -772,8 +768,6 @@ if {[info commands ::tk::wordBreakBefore] eq ""} {
     proc ::tk::wordBreakBefore {str start {locale {}}} {
 	if {$start < 0} {
 	    set start -1
-	} elseif {[string match end-* $start]} {
-	    set start [expr {[string length $str]-1-[string range $start 4 end]}]
 	}
 	set start [tcl_wordBreakBefore $str $start]
 	if {$start < 0} {
@@ -786,8 +780,6 @@ if {[info commands ::tk::wordBreakAfter] eq ""} {
     proc ::tk::wordBreakAfter {str start {locale {}}} {
 	if {$start < 0} {
 	    set start -1
-	} elseif {[string match end-* $start]} {
-	    set start [expr {[string length $str]-1-[string range $start 4 end]}]
 	}
 	set start [tcl_wordBreakAfter $str $start]
 	if {$start < 0} {
@@ -807,9 +799,6 @@ if {[info commands ::tk::endOfCluster] eq ""} {
 	} elseif {$start >= [string length $str]} {
 	    return ""
 	}
-	if {[string length [string index $str $start]] > 1} {
-	    incr start
-	}
 	incr start
 	return $start
     }
@@ -825,9 +814,6 @@ if {[info commands ::tk::startOfCluster] eq ""} {
 	} elseif {$start >= [string length $str]} {
 	    return [string length $str]
 	}
-	if {[string length [string index $str $start]] < 1} {
-	    incr start -1
-	}
 	if {$start < 0} {
 	    return ""
 	}