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.542.2.34 -r1.542.2.35
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Jul 2019 14:36:01 -0000	1.542.2.34
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	29 Jul 2019 19:01:31 -0000	1.542.2.35
@@ -1355,6 +1355,7 @@
   Page instproc is_folder_page {{-include_folder_links true}} {
     return 0
   }
+
   FormPage instproc is_folder_page {{-include_folder_links true}} {
     set page_template_name [${:page_template} name]
     if {$page_template_name eq "en:folder.form"} {return 1}
@@ -1371,6 +1372,7 @@
   Page instproc is_link_page {} {
     return 0
   }
+
   FormPage instproc is_link_page {} {
     #
     # Make sure, the page_template is instantiated
@@ -1381,6 +1383,18 @@
     return [expr {[${:page_template} name] eq "en:link.form"}]
   }
 
+  Page instproc is_unprefixed {} {
+    #
+    # Pages which should not get an extra language prefix.  In case,
+    # your package has further such requirements, extend this proc in
+    # you package.
+    #
+    return [expr {[:is_folder_page]
+                  || [:is_link_page]
+                  || ${:name} eq ${:revision_id}
+                }]
+  }
+
   #
   # link properties
   #
@@ -2434,15 +2448,30 @@
     return $result
   }
 
-  Page instproc new_link {-object_type -name -title -nls_language -return_url -parent_id page_package_id} {
+  Page instproc new_link {
+    -object_type
+    -name -title
+    -nls_language
+    -return_url
+    -parent_id
+    page_package_id
+  } {
     if {[info exists parent_id] && $parent_id eq ""} {
       unset parent_id
     }
     return [::$page_package_id make_link $page_package_id \
                 edit-new object_type name title nls_language return_url parent_id autoname]
   }
 
-  FormPage instproc new_link {-object_type -name -title -nls_language -parent_id -return_url page_package_id} {
+  FormPage instproc new_link {
+    -object_type
+    -name
+    -title
+    -nls_language
+    -parent_id
+    -return_url
+    page_package_id
+  } {
     if {[info exists object_type]} {
       next
     } else {