summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-11-30 21:21:48 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-11-30 21:21:48 (GMT)
commita24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a (patch)
tree24ccb2318d04412685b1a4262df7c33df0864d34 /library
parentddb9e825e0b85f216d172f8b537257c8d58b0de9 (diff)
parentb8bfd3505b511a3cc94297df7f04c55505d6df2c (diff)
downloadtk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.zip
tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.gz
tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.bz2
merge 8.5
Diffstat (limited to 'library')
-rw-r--r--library/entry.tcl10
-rw-r--r--library/tk.tcl1
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>
}
#----------------------------------------------------------------------