diff options
| author | dgp@users.sourceforge.net <dgp> | 2015-11-30 21:21:48 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2015-11-30 21:21:48 (GMT) |
| commit | 82789c8cb896d743fc25f8b5e1f98f92dfcdab46 (patch) | |
| tree | 24ccb2318d04412685b1a4262df7c33df0864d34 /library | |
| parent | df687f2ff1b835ca603ad4fa2e870abd7c8cb8a5 (diff) | |
| parent | 7fd5a5e6c8eee7bc6e73242b4d5c517593759464 (diff) | |
| download | tk-82789c8cb896d743fc25f8b5e1f98f92dfcdab46.zip tk-82789c8cb896d743fc25f8b5e1f98f92dfcdab46.tar.gz tk-82789c8cb896d743fc25f8b5e1f98f92dfcdab46.tar.bz2 | |
merge 8.5
Diffstat (limited to 'library')
| -rw-r--r-- | library/entry.tcl | 10 | ||||
| -rw-r--r-- | library/tk.tcl | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/library/entry.tcl b/library/entry.tcl index 382cc88..c3e573d 100644 --- a/library/entry.tcl +++ b/library/entry.tcl @@ -373,12 +373,18 @@ proc ::tk::EntryMouseSelect {w x} { } } word { - if {$cur < [$w index anchor]} { + if {$cur < $anchor} { set before [tcl_wordBreakBefore [$w get] $cur] set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]] - } else { + } elseif {$cur > $anchor} { set before [tcl_wordBreakBefore [$w get] $anchor] set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]] + } else { + if {[$w index @$Priv(pressX)] < $anchor} { + incr anchor -1 + } + set before [tcl_wordBreakBefore [$w get] $anchor] + set after [tcl_wordBreakAfter [$w get] $anchor] } if {$before < 0} { set before 0 diff --git a/library/tk.tcl b/library/tk.tcl index 64fb6f6..b971329 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -308,7 +308,6 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} { event $op <<Cut>> <Control-Key-w> event $op <<Copy>> <Meta-Key-w> event $op <<Paste>> <Control-Key-y> - event $op <<Undo>> <Control-underscore> } #---------------------------------------------------------------------- |