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 -r1.206 -r1.207
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	27 Feb 2008 09:12:06 -0000	1.206
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	29 Feb 2008 08:40:48 -0000	1.207
@@ -198,7 +198,7 @@
 
   Page set recursion_count 0
   Page array set RE {
-    include {([^\\]){{([^<]+?)}}(\s|<|$)?}
+    include {([^\\]){{([^<]+?)}}([<\s]|$)}
     anchor  {([^\\])\\\[\\\[([^\]]+?)\\\]\\\]}
     div     {()([^\\])&gt;&gt;([^&<]*?)&lt;&lt;()([ \n]*)?}
     clean   {[\\](\{\{|&gt;&gt;|\[\[)}
@@ -800,7 +800,7 @@
         -folder_id $parent_id -package_id $package_id
     
     if {[catch {eval [self]::link configure $options} error]} {
-      return "${ch}<div class='errorMsg'>Error during processing of options [list $options]: $error</div>"
+      return "${ch}<div class='errorMsg'>Error during processing of options [list $options] of link of type [[self]::link info class]:<blockquote>$error</blockquote></div>"
     } else {
       return $ch[[self]::link render]
     }