erp5_code_mirror: Add syntax checking in Merge view as well.

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

@@ -480,11 +480,15 @@
       matchBrackets: true,\n
       /* viewportMargin: Infinity, */\n
       extraKeys: {"Ctrl-Space": "autocomplete",\n
+                  "Ctrl-Q": function(cm){cm.foldCode(cm.getCursor());},\n
                   "Ctrl-S": function(cm){saveDocument(merge_mode_elem.edit, $.Event(\'click\'))}},\n
       foldGutter: true,\n
       lineWrapping: true,\n
-      gutters: ["CodeMirror-linenumbers",\n
-                "CodeMirror-foldgutter"]});\n
+      gutters: ["CodeMirror-lint-markers",\n
+                "CodeMirror-linenumbers",\n
+                "CodeMirror-foldgutter"],\n
+      lint: {"getAnnotations": checkPythonSourceCode,\n
+             "async": true}});\n
 \n
    $("#merge").keyup(\n
      function(event) {\n

bt5/erp5_code_mirror/bt/change_log

+2015-01-22 arnaud.fontaine
+* Add syntax checking in Merge view as well.
+
 2015-01-22 arnaud.fontaine
 * Update CodeMirror to 4.11.