Index: openacs-4/packages/s5/tcl/s5-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/s5/tcl/s5-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/s5/tcl/s5-procs.tcl	16 May 2008 17:49:39 -0000	1.13
+++ openacs-4/packages/s5/tcl/s5-procs.tcl	7 Feb 2009 20:36:36 -0000	1.14
@@ -252,19 +252,25 @@
 }
 
 
-namespace eval ::xowiki::formfield {
-  ###########################################################
+if {![::xotcl::Object isclass ::xowiki::formfield::code_listing]} {
   #
-  # ::xowiki::formfield::code_listing
+  # code_listing was moved to xowiki.
   #
-  ###########################################################
-
-  Class code_listing -superclass textarea -parameter {
-    {rows 20}
-    {cols 80}
+  # keep this definition just for backwards compatibility
+  namespace eval ::xowiki::formfield {
+    ###########################################################
+    #
+    # ::xowiki::formfield::code_listing
+    #
+    ###########################################################
+    
+    Class code_listing -superclass textarea -parameter {
+      {rows 20}
+      {cols 80}
+    }
+    code_listing instproc pretty_value {v} {
+      [my object] do_substitutions 0
+      return "<pre class='code'>[api_pretty_tcl [my value]]</pre>"
+    }
   }
-  code_listing instproc pretty_value {v} {
-    [my object] do_substitutions 0
-    return "<pre class='code'>[api_pretty_tcl [my value]]</pre>"
-  }
 }
\ No newline at end of file