Merge 8.6

library/entry.tcl

@@ -599,7 +599,8 @@ proc ::tk::EntryTranspose w {
 
 if {[tk windowingsystem] eq "win32"}  {
     proc ::tk::EntryNextWord {w start} {
-	if {[$w cget -show] ne ""} {
+        # the check on [winfo class] is because the spinbox also uses this proc
+        if {[winfo class $w] eq "Entry" && [$w cget -show] ne ""} {
 	    return end
 	}
 	set pos [tk::endOfWord [$w get] [$w index $start]]
@@ -613,7 +614,8 @@ if {[tk windowingsystem] eq "win32"}  {
     }
 } else {
     proc ::tk::EntryNextWord {w start} {
-	if {[$w cget -show] ne ""} {
+        # the check on [winfo class] is because the spinbox also uses this proc
+        if {[winfo class $w] eq "Entry" && [$w cget -show] ne ""} {
 	    return end
 	}
 	set pos [tk::endOfWord [$w get] [$w index $start]]
@@ -634,7 +636,8 @@ if {[tk windowingsystem] eq "win32"}  {
 # start -	Position at which to start search.
 
 proc ::tk::EntryPreviousWord {w start} {
-    if {[$w cget -show] ne ""} {
+    # the check on [winfo class] is because the spinbox also uses this proc
+    if {[winfo class $w] eq "Entry" && [$w cget -show] ne ""} {
 	return 0
     }
     set pos [tk::startOfPreviousWord [$w get] [$w index $start]]

library/ttk/entry.tcl

@@ -257,7 +257,8 @@ set ::ttk::entry::State(startNext) \
 	[string equal [tk windowingsystem] "win32"]
 
 proc ttk::entry::NextWord {w start} {
-    if {[$w cget -show] ne ""} {
+    # the check on [winfo class] is because the spinbox and combobox also use this proc
+    if {[winfo class $w] eq "TEntry" && [$w cget -show] ne ""} {
 	return end
     }
     variable State
@@ -274,7 +275,8 @@ proc ttk::entry::NextWord {w start} {
 ## PrevWord -- Find the previous word position.
 #
 proc ttk::entry::PrevWord {w start} {
-    if {[$w cget -show] ne ""} {
+    # the check on [winfo class] is because the spinbox and combobox also use this proc
+    if {[winfo class $w] eq "TEntry" && [$w cget -show] ne ""} {
 	return 0
     }
     set pos [tk::startOfPreviousWord [$w get] [$w index $start]]

tests/spinbox.test

@@ -3888,6 +3888,26 @@ test spinbox-25.1 {textvariable lives in a non-existing namespace} -setup {
 } -cleanup {
     destroy .s
 } -result {can't trace "thisnsdoesntexist::myvar": parent namespace doesn't exist}
+test spinbox-25.3 {Bugs [2a32225cd1] and [9fa3e08243]} -setup {
+    destroy .s
+    pack [spinbox .s]
+    update
+    set res {}
+} -body {
+    .s insert end "A sample text"
+    .s icursor end
+    event generate .s <<PrevWord>>  ; # shall move insert to index 9
+    .s delete insert end
+    lappend res [.s get]
+    .s delete 0 end
+    .s insert end "A sample text"
+    .s icursor 2
+    event generate .s <<NextWord>>  ; # shall move insert to index 9
+    .s delete 0 insert
+    lappend res [.s get]
+} -cleanup {
+    destroy .s
+} -result {{A sample } text}
 
 # Collected comments about lacks from the test
 # XXX Still need to write tests for SpinboxBlinkProc, SpinboxFocusProc,

tests/ttk/spinbox.test

@@ -287,6 +287,27 @@ test spinbox-4.2 "Increment with duplicates in -values, no wrap" -setup {
     unset -nocomplain ::spinbox_test max
 } -result {one two three 4 5 two six six six two 5 4 three two one one one one}
 
+test spinbox-11.2 {Bugs [2a32225cd1] and [9fa3e08243]} -setup {
+    destroy .s
+    pack [ttk::spinbox .s]
+    update
+    set res {}
+} -body {
+    .s insert end "A sample text"
+    .s icursor end
+    event generate .s <<PrevWord>>  ; # shall move insert to index 9
+    .s delete insert end
+    lappend res [.s get]
+    .s delete 0 end
+    .s insert end "A sample text"
+    .s icursor 2
+    event generate .s <<NextWord>>  ; # shall move insert to index 9
+    .s delete 0 insert
+    lappend res [.s get]
+} -cleanup {
+    destroy .s
+} -result {{A sample } text}
+
 
 # nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
 # see also #1439266