Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.263 -r1.264
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	9 Apr 2018 07:58:06 -0000	1.263
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	9 Apr 2018 08:11:05 -0000	1.264
@@ -106,7 +106,7 @@
   #}
 
   FormField instproc init {} {
-    if {![info exists :label]} {my label [string totitle ${:name}]}
+    if {![info exists :label]} {:label [string totitle ${:name}]}
     if {![info exists :id]} {set :id ${:name}}
     set :html(id) ${:id}
     #if {[info exists :default]} {set :value [:default]}
@@ -239,7 +239,7 @@
 
   FormField instproc remove_omit {} {
     set m ::xowiki::formfield::omit
-    if {[:ismixin $m]} {my mixin delete $m}
+    if {[:ismixin $m]} {:mixin delete $m}
   }
   FormField instproc set_disabled {disable} {
     #:msg "${:name} set disabled $disable"
@@ -285,13 +285,13 @@
     switch -glob -- $s {
       optional    {set :required false}
       required    {set :required true; my remove_omit}
-      omit        {my mixin add ::xowiki::formfield::omit}
-      noomit      {my remove_omit}
-      disabled    {my set_disabled true}
-      readonly    {my readonly true}
-      enabled     {my set_disabled false}
-      label=*     {my label     [lindex [split $s =] 1]}
-      help_text=* {my help_text [lindex [split $s =] 1]}
+      omit        {:mixin add ::xowiki::formfield::omit}
+      noomit      {:remove_omit}
+      disabled    {:set_disabled true}
+      readonly    {:readonly true}
+      enabled     {:set_disabled false}
+      label=*     {:label     [lindex [split $s =] 1]}
+      help_text=* {:help_text [lindex [split $s =] 1]}
       *=*         {
         set p [string first = $s]
         set attribute [string range $s 0 $p-1]
@@ -465,7 +465,7 @@
     #
     foreach att $atts {
       lassign $att var value
-      if {[info exists :$var]} {my unset $var}
+      if {[info exists :$var]} {:unset $var}
     }
   }
 
@@ -758,7 +758,7 @@
   }
   submit_button instproc render_input {} {
     # don't disable submit buttons
-    if {[:type] eq "submit"} {my unset -nocomplain disabled}
+    if {[:type] eq "submit"} {:unset -nocomplain disabled}
     ::html::button [:get_attributes name type {form_button_CSSclass class} title disabled] {
       ::html::t ${:value}
     }
@@ -795,8 +795,8 @@
     }
     return 1
   }
-  file instproc tmpfile {value}      {my set [self proc] $value}
-  file instproc content-type {value} {my set [self proc] $value}
+  file instproc tmpfile {value}      {:set [self proc] $value}
+  file instproc content-type {value} {:set [self proc] $value}
   file instproc initialize {} {
     :type file
     set :booleanHTMLAttributes {multiple}
@@ -1093,7 +1093,7 @@
   }
   import_archive instproc initialize {} {
     next
-    if {[:help_text] eq ""} {my help_text "#xowiki.formfield-import_archive-help_text#"}
+    if {[:help_text] eq ""} {:help_text "#xowiki.formfield-import_archive-help_text#"}
   }
   import_archive instproc pretty_value {v} {
     set package_id [${:object} package_id]
@@ -1165,7 +1165,7 @@
     set :widget_type text(hidden)
     # remove mixins in case of retyping
     :mixin ""
-    if {[info exists :size]} {my unset size}
+    if {[info exists :size]} {:unset size}
   }
   hidden instproc render_item {} {
     # don't render the labels
@@ -1628,8 +1628,8 @@
     if {![:istype ::xowiki::formfield::richtext] && [info exists :editor]} {
       # downgrading
       #:msg "downgrading [:info class]"
-      foreach m [:info mixin] {if {[$m exists editor_mixin]} {my mixin delete $m}}
-      foreach v {editor options} {if {[info exists :$v]} {my unset $v}}
+      foreach m [:info mixin] {if {[$m exists editor_mixin]} {:mixin delete $m}}
+      foreach v {editor options} {if {[info exists :$v]} {:unset $v}}
     }
     next
   }
@@ -1702,7 +1702,7 @@
         error [_ xowiki.error-form_constraint-unknown_editor \
                    [list name ${:name} editor [:editor] editors $editors]]
       }
-      foreach m [:info mixin] {if {[$m exists editor_mixin]} {my mixin delete $m}}
+      foreach m [:info mixin] {if {[$m exists editor_mixin]} {:mixin delete $m}}
       :mixin add $editor_class
       #:msg "MIXIN $editor: [:info precedence]"
       :reset_parameter
@@ -3112,7 +3112,7 @@
 
   youtube_url instproc initialize {} {
     next
-    if {[:help_text] eq ""} {my help_text "#xowiki.formfield-youtube_url-help_text#"}
+    if {[:help_text] eq ""} {:help_text "#xowiki.formfield-youtube_url-help_text#"}
   }
   youtube_url instproc pretty_value {v} {
     if {$v eq ""} {
@@ -3145,7 +3145,7 @@
       }
   image_url instproc initialize {} {
     next
-    if {[:help_text] eq ""} {my help_text "#xowiki.formfield-image_url-help_text#"}
+    if {[:help_text] eq ""} {:help_text "#xowiki.formfield-image_url-help_text#"}
   }
   image_url instproc entry_name {value} {
     set value [string map [list %2e .] $value]
@@ -3565,7 +3565,7 @@
   }
   label instproc render_item {} {
     # sanity check; required and label do not fit well together
-    if {[:required]} {my required false}
+    if {[:required]} {:required false}
     next
   }
   label instproc render_input {} {
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.216 -r1.217
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 Apr 2018 07:58:06 -0000	1.216
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 Apr 2018 08:11:05 -0000	1.217
@@ -81,7 +81,7 @@
     }
   }
   ::xowiki::Includelet proc available_includelets {} {
-    if {[array exists :html]} {my array unset html}
+    if {[array exists :html]} {:array unset html}
     :describe_includelets [::xowiki::Includelet info subclass]
     set result "<ul>"
     foreach d [lsort [array names :html]] {
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -N -r1.101 -r1.102
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	9 Apr 2018 07:58:06 -0000	1.101
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	9 Apr 2018 08:11:05 -0000	1.102
@@ -578,7 +578,7 @@
     ::xo::Page requireJS urn:ad:js:get-http-object
     ::xo::Page requireJS  "/resources/xowiki/popup-handler.js"
     ::xo::Page requireJS  "/resources/xowiki/overlib/overlib.js"
-    if {![info exists :cssid]} {my cssid [::xowiki::Includelet html_id [self]]}
+    if {![info exists :cssid]} {:cssid [::xowiki::Includelet html_id [self]]}
     template::add_event_listener \
         -id [:cssid] \
         -script [subst {showInfo('[ns_quotehtml $href?master=0]','[ns_quotehtml $label]')}]
Index: openacs-4/packages/xowiki/tcl/repeat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/repeat-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/xowiki/tcl/repeat-procs.tcl	14 Mar 2018 15:40:49 -0000	1.12
+++ openacs-4/packages/xowiki/tcl/repeat-procs.tcl	9 Apr 2018 08:11:05 -0000	1.13
@@ -66,7 +66,7 @@
       # don't propagate "repeat" and "label" properties
       if { [string match "repeat=*" $s] || [string match "label=*" $s] } continue
       if { "required" eq $s} {set is_required true; continue}
-      if { "disabled" eq $s} {my set_disabled true}
+      if { "disabled" eq $s} {:set_disabled true}
       lappend result $s
     }
     return [list $is_required [join $result ,]]
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -N -r1.142 -r1.143
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	9 Apr 2018 07:58:06 -0000	1.142
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	9 Apr 2018 08:11:05 -0000	1.143
@@ -50,8 +50,8 @@
     set __fields ""
     set field_list [:field_list]
     set show_page_order [[${:data} package_id] show_page_order]
-    if {!$show_page_order} { my f.page_order "= hidden" } 
-    if {${:autoname}}      { my f.name       "= hidden,optional"}
+    if {!$show_page_order} { :f.page_order "= hidden" } 
+    if {${:autoname}}      { :f.name       "= hidden,optional"}
     set form_fields [list]
 
     foreach __field $field_list {
@@ -620,7 +620,7 @@
       # don't call validate on the folder object, don't let people change its name
       set name [${:data} set name]
       if {$name eq "::[${:data} set parent_id]"} {
-        my f.name  "= inform,help_text="
+        :f.name  "= inform,help_text="
         :validate {{name {1} {dummy}} }
         #:log "--e don't validate folder id - parent_id = [${:data} set parent_id]"
       }
@@ -734,7 +734,7 @@
 
     set __ia [${:data} set instance_attributes]
     foreach var ${:page_instance_form_atts} {
-      if {[dict exists $__ia $var]} {my var $var [list [dict get $__ia $var]]}
+      if {[dict exists $__ia $var]} {:var $var [list [dict get $__ia $var]]}
     }
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.511 -r1.512
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Apr 2018 07:58:06 -0000	1.511
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Apr 2018 08:11:05 -0000	1.512
@@ -1582,7 +1582,7 @@
         #
         set name $stripped_name
       } else {
-        if {$nls_language ne ""} {my nls_language $nls_language}
+        if {$nls_language ne ""} {:nls_language $nls_language}
         set name [:lang]:$stripped_name
       }
     }
@@ -2373,9 +2373,9 @@
     foreach l0 [split $content \n] {
       append l [string map $markupmap(escape) $l0]
       if {[string first \{\{ $l] > -1 && [string first \}\} $l] == -1} {append l " "; continue}
-      set l [:regsub_eval $RE(anchor)  $l {my anchor  "\1"} "1"]
-      set l [:regsub_eval $RE(div)     $l {my div     "\1"}]
-      set l [:regsub_eval $RE(include) $l {my include_content "\1" "\2"}]
+      set l [:regsub_eval $RE(anchor)  $l {:anchor  "\1"} "1"]
+      set l [:regsub_eval $RE(div)     $l {:div     "\1"}]
+      set l [:regsub_eval $RE(include) $l {:include_content "\1" "\2"}]
       #regsub -all $RE(clean) $l {\1} l
       regsub -all $RE(clean2) $l { \1} l
       set l [string map $markupmap(unescape) $l]
@@ -3101,9 +3101,9 @@
     set html ""
     foreach l [split $raw_content \n] {
       set l [string map $markupmap(escape) $l]
-      set l [:regsub_eval $RE(anchor)  $l {my anchor  "\1"}]
-      set l [:regsub_eval $RE(div)     $l {my div     "\1"}]
-      set l [:regsub_eval $RE(include) $l {my include_content "\1" ""}]
+      set l [:regsub_eval $RE(anchor)  $l {:anchor  "\1"}]
+      set l [:regsub_eval $RE(div)     $l {:div     "\1"}]
+      set l [:regsub_eval $RE(include) $l {:include_content "\1" ""}]
       #regsub -all $RE(clean) $l {\1} l
       set l [string map $markupmap(unescape) $l]
       append html $l \n
@@ -4470,7 +4470,7 @@
   FormPage instproc render_content {} {
     set package_id ${:package_id}
     :include_header_info -prefix form_view
-    if {[::xo::cc mobile]} {my include_header_info -prefix mobile}
+    if {[::xo::cc mobile]} {:include_header_info -prefix mobile}
 
     set text [:get_from_template text]
     if {$text ne ""} {
@@ -4499,7 +4499,7 @@
 
       set form [:regsub_eval  \
                     [template::adp_variable_regexp] $form \
-                    {my form_field_as_html -mode display "\\\1" "\2" $form_fields}]
+                    {:form_field_as_html -mode display "\\\1" "\2" $form_fields}]
 
       # we parse the form just for the margin-form.... maybe regsub?
       dom parse -simple -html $form :doc
@@ -4567,7 +4567,7 @@
     # Iterate over the variables for substitution
     set content [:regsub_eval -noquote true \
                      [template::adp_variable_regexp] " $content" \
-                     {my get_value -field_spec $field_spec -cr_field_spec $cr_field_spec "\\\1" "\2"}]
+                     {:get_value -field_spec $field_spec -cr_field_spec $cr_field_spec "\\\1" "\2"}]
     return [string range $content 1 end]
   }
 
Index: openacs-4/packages/xowiki/tcl/yui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/xowiki/tcl/yui-procs.tcl	28 Mar 2018 17:00:41 -0000	1.10
+++ openacs-4/packages/xowiki/tcl/yui-procs.tcl	9 Apr 2018 08:11:05 -0000	1.11
@@ -573,7 +573,7 @@
             my render-actions
             my render-body
           }
-          if {[llength $bulkactions]>0} { my render-bulkactions }
+          if {[llength $bulkactions]>0} { :render-bulkactions }
         }
       }
       ::xo::Page requireJS "YAHOO.util.Event.onDOMReady(function () {\n[:render_yui_js]});"
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/test.tcl,v
diff -u -N -r1.42 -r1.43
--- openacs-4/packages/xowiki/www/admin/test.tcl	3 Jan 2018 18:13:35 -0000	1.42
+++ openacs-4/packages/xowiki/www/admin/test.tcl	9 Apr 2018 08:11:05 -0000	1.43
@@ -4,10 +4,10 @@
 test set passed 0
 test set failed 0
 test proc case msg {ad_return_top_of_page "<title>$msg</title><h2>$msg</h2>"}
-test proc section msg    {my reset; ns_write "<hr><h3>$msg</h3>"}
+test proc section msg    {:reset; ns_write "<hr><h3>$msg</h3>"}
 test proc subsection msg {ns_write "<h4>$msg</h4>"}
 test proc subsubsection msg {ns_write "<h5>$msg</h5>"}
-test proc errmsg msg     {my code "ERROR: [string map [list < {&lt;} > {&gt;}] $msg]<br/>";test incr failed}
+test proc errmsg msg     {:code "ERROR: [string map [list < {&lt;} > {&gt;}] $msg]<br/>";test incr failed}
 test proc okmsg msg      {ns_write "OK: $msg<br/>"; test incr passed}
 test proc code msg       {ns_write "<pre>$msg</pre>"}
 test proc hint msg       {ns_write "$msg<br/>"}