1 files changed, 6 insertions, 8 deletions
diff --git a/library/word.tcl b/library/word.tcl
index b8f34a5..0246530 100644
--- a/library/word.tcl
+++ b/library/word.tcl
@@ -11,15 +11,13 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 # The following variables are used to determine which characters are
-# interpreted as white space.
-
-if {$::tcl_platform(platform) eq "windows"} {
-    # Windows style - any but a unicode space char
-    set ::tcl_wordchars {\S}
-    set ::tcl_nonwordchars {\s}
-} else {
-    # Motif style - any unicode word char (number, letter, or underscore)
+# interpreted as word characters. See bug [f1253530cdd8]. Will
+# probably be removed in Tcl 9.
+
+if {![info exists ::tcl_wordchars]} {
     set ::tcl_wordchars {\w}
+}
+if {![info exists ::tcl_nonwordchars]} {
     set ::tcl_nonwordchars {\W}
 }