Make IME bindings not leak into global variables

1 files changed, 18 insertions, 5 deletions

diff --git a/library/entry.tcl b/library/entry.tcl
index 99f6eb4..1af9e65 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -276,11 +276,7 @@ bind Entry <<TkStartIMEMarkedText>> {
     dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
 }
 bind Entry <<TkEndIMEMarkedText>> {
-    if {[catch {dict get $::tk::Priv(IMETextMark) "%W"} mark]} {
-	bell
-    } else {
-	%W selection range $mark insert
-    }
+    ::tk::EntryEndIMEMarkedText %W
 }
 bind Entry <<TkClearIMEMarkedText>> {
     %W delete [dict get $::tk::Priv(IMETextMark) "%W"] [%W index insert]
@@ -289,6 +285,23 @@ bind Entry <<TkAccentBackspace>> {
     tk::EntryBackspace %W
 }
 
+# ::tk::EntryEndIMEMarkedText --
+# Handles input method text marking in an entry
+#
+# Arguments:
+# w -		The entry window.
+
+proc ::tk::EntryEndIMEMarkedText {w} {
+    variable Priv
+    if {[catch {
+	set mark [dict get $Priv(IMETextMark) $w]
+    }]} {
+	bell
+	return
+    }
+    $w selection range $mark insert
+}
+
 # A few additional bindings of my own.
 
 bind Entry <Button-2> {