Rename 'edit' addon to 'cm_edit' to prevent conflict with ERP5 'edit()' method.

Installation was working fine because Skin Folder are not ERP5 object but when
updating the bt5, it failed because Folder objects are saved as Trash Folder
(ERP5 object).

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml

@@ -29,10 +29,10 @@
 <script type="text/javascript" src="&dtml-portal_url;/codemirror/lib/codemirror.js"></script>\n
 <link rel="stylesheet" href="&dtml-portal_url;/codemirror/lib/codemirror.css">\n
 <script type="text/javascript" src="&dtml-portal_url;/codemirror/mode/&dtml-mode;/&dtml-mode;.js"></script>\n
-<script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/edit/matchbrackets.js"></script>\n
+<script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/cm_edit/matchbrackets.js"></script>\n
 \n
 <!-- Trailing spaces -->\n
-<script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/edit/trailingspace.js"></script>\n
+<script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/cm_edit/trailingspace.js"></script>\n
 <style type="text/css">\n
   .cm-trailingspace {\n
     background-color: gray;\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/edit.xml → bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit.xml

@@ -14,7 +14,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>edit</string> </value>
+            <value> <string>cm_edit</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/closebrackets.html.xml

@@ -44,7 +44,7 @@
 \n
 <link rel="stylesheet" href="../lib/codemirror.css">\n
 <script src="../lib/codemirror.js"></script>\n
-<script src="../addon/edit/closebrackets.js"></script>\n
+<script src="../addon/cm_edit/closebrackets.js"></script>\n
 <script src="../mode/javascript/javascript.js"></script>\n
 <style type="text/css">\n
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/closetag.html.xml

@@ -44,7 +44,7 @@
 \n
 <link rel="stylesheet" href="../lib/codemirror.css">\n
 <script src="../lib/codemirror.js"></script>\n
-<script src="../addon/edit/closetag.js"></script>\n
+<script src="../addon/cm_edit/closetag.js"></script>\n
 <script src="../addon/fold/xml-fold.js"></script>\n
 <script src="../mode/xml/xml.js"></script>\n
 <script src="../mode/javascript/javascript.js"></script>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/emacs.html.xml

@@ -47,7 +47,7 @@
 <script src="../lib/codemirror.js"></script>\n
 <script src="../mode/clike/clike.js"></script>\n
 <script src="../keymap/emacs.js"></script>\n
-<script src="../addon/edit/matchbrackets.js"></script>\n
+<script src="../addon/cm_edit/matchbrackets.js"></script>\n
 <script src="../addon/comment/comment.js"></script>\n
 <script src="../addon/dialog/dialog.js"></script>\n
 <script src="../addon/search/searchcursor.js"></script>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/matchtags.html.xml

@@ -45,7 +45,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">\n
 <script src="../lib/codemirror.js"></script>\n
 <script src="../addon/fold/xml-fold.js"></script>\n
-<script src="../addon/edit/matchtags.js"></script>\n
+<script src="../addon/cm_edit/matchtags.js"></script>\n
 <script src="../mode/xml/xml.js"></script>\n
 <style type="text/css">\n
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/sublime.html.xml

@@ -50,8 +50,8 @@
 <script src="../addon/search/searchcursor.js"></script>\n
 <script src="../addon/search/search.js"></script>\n
 <script src="../addon/dialog/dialog.js"></script>\n
-<script src="../addon/edit/matchbrackets.js"></script>\n
-<script src="../addon/edit/closebrackets.js"></script>\n
+<script src="../addon/cm_edit/matchbrackets.js"></script>\n
+<script src="../addon/cm_edit/closebrackets.js"></script>\n
 <script src="../addon/comment/comment.js"></script>\n
 <script src="../addon/wrap/hardwrap.js"></script>\n
 <script src="../addon/fold/foldcode.js"></script>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/theme.html.xml

@@ -77,7 +77,7 @@
 <script src="../lib/codemirror.js"></script>\n
 <script src="../mode/javascript/javascript.js"></script>\n
 <script src="../addon/selection/active-line.js"></script>\n
-<script src="../addon/edit/matchbrackets.js"></script>\n
+<script src="../addon/cm_edit/matchbrackets.js"></script>\n
 <style type="text/css">\n
       .CodeMirror {border: 1px solid black; font-size:13px}\n
     </style>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/trailingspace.html.xml

@@ -44,7 +44,7 @@
 \n
 <link rel="stylesheet" href="../lib/codemirror.css">\n
 <script src="../lib/codemirror.js"></script>\n
-<script src="../addon/edit/trailingspace.js"></script>\n
+<script src="../addon/cm_edit/trailingspace.js"></script>\n
 <style type="text/css">\n
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}\n
       .cm-trailingspace {\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/demo/vim.html.xml

@@ -48,7 +48,7 @@
 <script src="../addon/dialog/dialog.js"></script>\n
 <script src="../addon/search/searchcursor.js"></script>\n
 <script src="../mode/clike/clike.js"></script>\n
-<script src="../addon/edit/matchbrackets.js"></script>\n
+<script src="../addon/cm_edit/matchbrackets.js"></script>\n
 <script src="../keymap/vim.js"></script>\n
 <style type="text/css">\n
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/doc/compress.html.xml

@@ -232,13 +232,13 @@
           <option value="http://codemirror.net/addon/selection/active-line.js">active-line.js</option>\n
           <option value="http://codemirror.net/addon/hint/anyword-hint.js">anyword-hint.js</option>\n
           <option value="http://codemirror.net/addon/fold/brace-fold.js">brace-fold.js</option>\n
-          <option value="http://codemirror.net/addon/edit/closebrackets.js">closebrackets.js</option>\n
-          <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>\n
+          <option value="http://codemirror.net/addon/cm_edit/closebrackets.js">closebrackets.js</option>\n
+          <option value="http://codemirror.net/addon/cm_edit/closetag.js">closetag.js</option>\n
           <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>\n
           <option value="http://codemirror.net/addon/comment/comment.js">comment.js</option>\n
           <option value="http://codemirror.net/addon/fold/comment-fold.js">comment-fold.js</option>\n
           <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>\n
-          <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>\n
+          <option value="http://codemirror.net/addon/cm_edit/continuelist.js">continuelist.js</option>\n
           <option value="http://codemirror.net/addon/hint/css-hint.js">css-hint.js</option>\n
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>\n
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>\n
@@ -255,8 +255,8 @@
           <option value="http://codemirror.net/addon/fold/markdown-fold.js">markdown-fold.js</option>\n
           <option value="http://codemirror.net/addon/selection/mark-selection.js">mark-selection.js</option>\n
           <option value="http://codemirror.net/addon/search/match-highlighter.js">match-highlighter.js</option>\n
-          <option value="http://codemirror.net/addon/edit/matchbrackets.js">matchbrackets.js</option>\n
-          <option value="http://codemirror.net/addon/edit/matchtags.js">matchtags.js</option>\n
+          <option value="http://codemirror.net/addon/cm_edit/matchbrackets.js">matchbrackets.js</option>\n
+          <option value="http://codemirror.net/addon/cm_edit/matchtags.js">matchtags.js</option>\n
           <option value="http://codemirror.net/addon/merge/merge.js">merge.js</option>\n
           <option value="http://codemirror.net/addon/mode/multiplex.js">multiplex.js</option>\n
           <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>\n
@@ -271,7 +271,7 @@
           <option value="http://codemirror.net/addon/mode/simple.js">simple.js</option>\n
           <option value="http://codemirror.net/addon/scroll/simplescrollbars.js">simplescrollbars.js</option>\n
           <option value="http://codemirror.net/addon/hint/sql-hint.js">sql-hint.js</option>\n
-          <option value="http://codemirror.net/addon/edit/trailingspace.js">trailingspace.js</option>\n
+          <option value="http://codemirror.net/addon/cm_edit/trailingspace.js">trailingspace.js</option>\n
           <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>\n
           <option value="http://codemirror.net/addon/fold/xml-fold.js">xml-fold.js</option>\n
           <option value="http://codemirror.net/addon/hint/xml-hint.js">xml-hint.js</option>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/doc/manual.html.xml

@@ -2227,7 +2227,7 @@ editor.setOption("extraKeys", {\n
       the <a href="#addon_search"><code>search</code></a> addon will\n
       automatically use it.</dd>\n
 \n
-      <dt id="addon_matchbrackets"><a href="../addon/edit/matchbrackets.js"><code>edit/matchbrackets.js</code></a></dt>\n
+      <dt id="addon_matchbrackets"><a href="../addon/cm_edit/matchbrackets.js"><code>edit/matchbrackets.js</code></a></dt>\n
       <dd>Defines an option <code>matchBrackets</code> which, when set\n
       to true, causes matching brackets to be highlighted whenever the\n
       cursor is next to them. It also adds a\n
@@ -2236,7 +2236,7 @@ editor.setOption("extraKeys", {\n
       used to run the bracket-finding algorithm that this uses\n
       internally.</dd>\n
 \n
-      <dt id="addon_closebrackets"><a href="../addon/edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>\n
+      <dt id="addon_closebrackets"><a href="../addon/cm_edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>\n
       <dd>Defines an option <code>autoCloseBrackets</code> that will\n
       auto-close brackets and quotes when typed. By default, it\'ll\n
       auto-close <code>()[]{}\'\'""</code>, but you can pass it a string\n
@@ -2248,7 +2248,7 @@ editor.setOption("extraKeys", {\n
       them, should have the second character also moved to its own\n
       line. <a href="../demo/closebrackets.html">Demo here</a>.</dd>\n
 \n
-      <dt id="addon_matchtags"><a href="../addon/edit/matchtags.js"><code>edit/matchtags.js</code></a></dt>\n
+      <dt id="addon_matchtags"><a href="../addon/cm_edit/matchtags.js"><code>edit/matchtags.js</code></a></dt>\n
       <dd>Defines an option <code>matchTags</code> that, when enabled,\n
       will cause the tags around the cursor to be highlighted (using\n
       the <code>CodeMirror-matchingtag</code> class). Also\n
@@ -2259,19 +2259,19 @@ editor.setOption("extraKeys", {\n
       the <code>addon/fold/xml-fold.js</code>\n
       addon. <a href="../demo/matchtags.html">Demo here.</a></dd>\n
 \n
-      <dt id="addon_trailingspace"><a href="../addon/edit/trailingspace.js"><code>edit/trailingspace.js</code></a></dt>\n
+      <dt id="addon_trailingspace"><a href="../addon/cm_edit/trailingspace.js"><code>edit/trailingspace.js</code></a></dt>\n
       <dd>Adds an option <code>showTrailingSpace</code> which, when\n
       enabled, adds the CSS class <code>cm-trailingspace</code> to\n
       stretches of whitespace at the end of lines.\n
       The <a href="../demo/trailingspace.html">demo</a> has a nice\n
       squiggly underline style for this class.</dd>\n
 \n
-      <dt id="addon_closetag"><a href="../addon/edit/closetag.js"><code>edit/closetag.js</code></a></dt>\n
+      <dt id="addon_closetag"><a href="../addon/cm_edit/closetag.js"><code>edit/closetag.js</code></a></dt>\n
       <dd>Provides utility functions for adding automatic tag closing\n
       to XML modes. See\n
       the <a href="../demo/closetag.html">demo</a>.</dd>\n
 \n
-      <dt id="addon_continuelist"><a href="../addon/edit/continuelist.js"><code>edit/continuelist.js</code></a></dt>\n
+      <dt id="addon_continuelist"><a href="../addon/cm_edit/continuelist.js"><code>edit/continuelist.js</code></a></dt>\n
       <dd>Markdown specific. Defines\n
       a <code>"newlineAndIndentContinueMarkdownList"</code> <a href="#commands">command</a>\n
       command that can be bound to <code>enter</code> to automatically\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/keymap/sublime.js.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897131.32</string> </value>
+            <value> <string>ts31074350.62</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -30,9 +30,9 @@
 \n
 (function(mod) {\n
   if (typeof exports == "object" && typeof module == "object") // CommonJS\n
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets"));\n
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/cm_edit/matchbrackets"));\n
   else if (typeof define == "function" && define.amd) // AMD\n
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod);\n
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/cm_edit/matchbrackets"], mod);\n
   else // Plain browser env\n
     mod(CodeMirror);\n
 })(function(CodeMirror) {\n
@@ -572,7 +572,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>20403</int> </value>
+            <value> <int>20409</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/keymap/vim.js.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897131.38</string> </value>
+            <value> <string>ts31074350.75</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>191805</int> </value>
+            <value> <int>191811</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -112,9 +112,9 @@
 \n
 (function(mod) {\n
   if (typeof exports == "object" && typeof module == "object") // CommonJS\n
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));\n
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/cm_edit/matchbrackets.js"));\n
   else if (typeof define == "function" && define.amd) // AMD\n
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);\n
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/cm_edit/matchbrackets"], mod);\n
   else // Plain browser env\n
     mod(CodeMirror);\n
 })(function(CodeMirror) {\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/mode/clike/scala.html.xml

@@ -45,7 +45,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">\n
 <link rel="stylesheet" href="../../theme/ambiance.css">\n
 <script src="../../lib/codemirror.js"></script>\n
-<script src="../../addon/edit/matchbrackets.js"></script>\n
+<script src="../../addon/cm_edit/matchbrackets.js"></script>\n
 <script src="clike.js"></script>\n
 <div id=nav>\n
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/mode/css/less.html.xml

@@ -44,7 +44,7 @@
 \n
 <link rel="stylesheet" href="../../lib/codemirror.css">\n
 <script src="../../lib/codemirror.js"></script>\n
-<script src="../../addon/edit/matchbrackets.js"></script>\n
+<script src="../../addon/cm_edit/matchbrackets.js"></script>\n
 <script src="css.js"></script>\n
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>\n
 <div id=nav>\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/mode/javascript/json-ld.html.xml

@@ -44,7 +44,7 @@
 \n
 <link rel="stylesheet" href="../../lib/codemirror.css">\n
 <script src="../../lib/codemirror.js"></script>\n
-<script src="../../addon/edit/matchbrackets.js"></script>\n
+<script src="../../addon/cm_edit/matchbrackets.js"></script>\n
 <script src="../../addon/comment/continuecomment.js"></script>\n
 <script src="../../addon/comment/comment.js"></script>\n
 <script src="javascript.js"></script>\n

bt5/erp5_code_mirror/bt/change_log

+2015-05-08 arnaud.fontaine
+* Rename 'edit' addon to 'cm_edit' to prevent conflict with ERP5 'edit()' method preventing update of the bt5.
+
 2015-05-08 arnaud.fontaine
 * Allow saving with C-s in the ZMI.