Index: openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	12 Aug 2013 20:01:06 -0000	1.21
+++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	27 Oct 2014 16:42:00 -0000	1.22
@@ -69,7 +69,7 @@
     if {[my exists __children]} {
       #my log "--W destroying children [my set __children]"
       foreach c [my set __children] { 
-	if {[my isobject $c]} {$c destroy}
+        if {[my isobject $c]} {$c destroy}
       }
     }
     #show_stack;my log "--W children murdered, now next, chlds=[my info children]"
@@ -91,7 +91,7 @@
     # push the active composite
     lappend composite [self]
     # check, if we have Tcl's apply available
-    if {$::tcl_version >= 8.5 && [info proc ::apply] eq ""} {
+    if {$::tcl_version >= 8.5 && [info procs ::apply] eq ""} {
       set errorOccurred [catch {::apply [list {} $cmds [self]]} errorMsg]
     } else {
       set errorOccurred [catch {namespace eval [self] $cmds} errorMsg]
@@ -136,31 +136,31 @@
     set yp [string first . $y]
     if {$xp == -1 && $yp == -1} {
       if {$x < $y} {
-	return -1
+        return -1
       } elseif {$x > $y} {
-	return 1
+        return 1
       } else {
-	return $def
+        return $def
       }
     } elseif {$xp == -1} {
-      set yh [string range $y 0 [expr {$yp-1}]]
+      set yh [string range $y 0 $yp-1]
       return [my __value_compare $x $yh -1]
     } elseif {$yp == -1} {
-      set xh [string range $x 0 [expr {$xp-1}]]
+      set xh [string range $x 0 $xp-1]
       return [my __value_compare $xh $y 1]
     } else {
       set xh [string range $x 0 $xp]
       set yh [string range $y 0 $yp]
       #puts "xh=$xh yh=$yh"
       if {$xh < $yh} {
-	return -1
+        return -1
       } elseif {$xh > $yh} {
-	return 1
+        return 1
       } else {
-	incr xp 
-	incr yp
-	#puts "rest [string range $x $xp end] [string range $y $yp end]"
-	return [my __value_compare [string range $x $xp end] [string range $y $yp end] $def]
+        incr xp 
+        incr yp
+        #puts "rest [string range $x $xp end] [string range $y $yp end]"
+        return [my __value_compare [string range $x $xp end] [string range $y $yp end] $def]
       }
     }
   }
@@ -180,3 +180,9 @@
   }
 }
 
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 2
+#    indent-tabs-mode: nil
+# End: