*** library/text.tcl.orig	Fri Apr 16 03:51:27 1999
--- library/text.tcl	Sun Jan 16 17:43:02 2000
***************
*** 377,390 ****
  	%W delete [tkTextPrevPos %W insert tcl_startOfPreviousWord] insert
      }
  }
! 
! # Macintosh only bindings:
! 
! # if text black & highlight black -> text white, other text the same
! if {![string compare $tcl_platform(platform) "macintosh"]} {
  bind Text <FocusIn> {
!     %W tag configure sel -borderwidth 0
!     %W configure -selectbackground systemHighlight -selectforeground systemHighlightText
  }
  bind Text <FocusOut> {
      %W tag configure sel -borderwidth 1
--- 377,395 ----
  	%W delete [tkTextPrevPos %W insert tcl_startOfPreviousWord] insert
      }
  }
! switch $tcl_platform(platform) {
!   "unix" {
!     # input method configuration binding
!     if {[string compare [info commands imconfigure] {}]} {
! 	bind Text <FocusIn> {catch {imconfigure %W}}
!     }
!   }
!   "macintosh" {
!   # if text black & highlight black -> text white, other text the same
  bind Text <FocusIn> {
! 	%W tag configure sel -borderwidth 0
! 	%W configure -selectbackground systemHighlight \
! 		-selectforeground systemHighlightText
  }
  bind Text <FocusOut> {
      %W tag configure sel -borderwidth 1
***************
*** 416,421 ****
--- 421,427 ----
  }
  
  # End of Mac only bindings
+  }
  }
  
  # A few additional bindings of my own.
***************
*** 791,801 ****
  
      set i [$w index insert]
      scan $i "%d.%d" line char
!     if {[string compare $tkPriv(prevPos) $i] != 0} {
  	set tkPriv(char) $char
      }
      set new [$w index [expr {$line + $n}].$tkPriv(char)]
!     if {[$w compare $new == end] || [$w compare $new == "insert linestart"]} {
  	set new $i
      }
      set tkPriv(prevPos) $new
--- 797,807 ----
  
      set i [$w index insert]
      scan $i "%d.%d" line char
!     if {[string compare $tkPriv(prevPos) $i]} {
  	set tkPriv(char) $char
      }
      set new [$w index [expr {$line + $n}].$tkPriv(char)]
!     if {[$w compare $new == end] || [$w compare $new == {insert linestart}]} {
  	set new $i
      }
      set tkPriv(prevPos) $new
