codemirror: update Codemirror to 5.13.4

This is newer codemirror with support to jump to line keybinding https://github.com/codemirror/CodeMirror/issues/3030


/cc @isabelle I don't know if this interfere with 53a4b813 

/reviewed-on nexedi/erp5!98

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

@@ -44,6 +44,7 @@
 <script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/dialog/dialog.js"></script>\n
 <script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/search/searchcursor.js"></script>\n
 <script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/search/search.js"></script>\n
+<script type="text/javascript" src="&dtml-portal_url;/codemirror/addon/search/jump-to-line.js"></script>\n
 \n
 <!-- Python autocomplete (Ctrl-Space, see below)\n
      TODO-arnau: Add ERP5 autocompletion?\n

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/.gitattributes.txt

-*.txt   text
-*.js    text
-*.html  text
-*.md    text
-*.json  text
-*.yml   text
-*.css   text
-*.svg   text

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/.gitignore.txt

-/node_modules
-/npm-debug.log
-test.html
-.tern-*
-*~
-*.swp
-.idea
-*.iml

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/.travis.yml.txt

-language: node_js
-node_js:
-  - 0.8

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/AUTHORS.txt

@@ -24,6 +24,11 @@ Alexander Solovyov
 Alexandre Bique
 alexey-k
 Alex Piggott
+Aliaksei Chapyzhenka
+Allen Sarkisyan
+Amin Shali
+Amin Ullah Khan
+amshali@google.com
 Amsul
 amuntean
 Amy
@@ -32,8 +37,10 @@ anaran
 AndersMad
 Anders Nawroth
 Anderson Mesquita
+Anders Wåglund
 Andrea G
 Andreas Reischuck
+Andres Taylor
 Andre von Houck
 Andrey Fedorov
 Andrey Klyuchnikov
@@ -41,23 +48,34 @@ Andrey Lushnikov
 Andy Joslin
 Andy Kimball
 Andy Li
+Angelo
 angelozerr
 angelo.zerr@gmail.com
+Ankit
 Ankit Ahuja
 Ansel Santosa
+Anthony Dugois
+anthonygego
+Anthony Gégo
 Anthony Grimes
 Anton Kovalyov
+AQNOUCH Mohammed
 areos
+Arnab Bose
 as3boyan
 AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
+Barret Rennie
+Basarat Ali Syed
 Bastian Müller
+belhaj
 Bem Jones-Bey
 benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Ben Mosher
 Bernhard Sirlinger
 Bert Chang
 Billy Moon
@@ -67,23 +85,35 @@ Blaine G
 blukat29
 boomyjee
 borawjm
+Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
 Brett Zamir
 Brian Grinstead
 Brian Sletten
 Bruce Mitchener
+Caitlin Potter
+Calin Barbat
+Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
 Chris Coyier
+Chris Ford
 Chris Granger
 Chris Houseknecht
+Chris Lohfink
 Chris Morgan
 Christian Oyarzun
+Christian Petrov
 Christopher Brown
+Christopher Mitchell
+Christopher Pfohl
+Chunliang Lyu
 ciaranj
 CodeAnimal
+coderaiser
+Cole R Lawrence
 ComFreek
 Curtis Gagliardi
 dagsta
@@ -95,21 +125,27 @@ Daniel, Dao Quang Minh
 Daniele Di Sarli
 Daniel Faust
 Daniel Huigens
+Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
 Danny Yoo
 darealshinji
 Darius Roberts
+Dave Brondsema
 Dave Myers
+David Barnett
 David Mignot
 David Pathakjee
 David Vázquez
+David Whittington
 deebugger
 Deep Thought
+Devin Abbott
 Devon Carew
 dignifiedquire
 Dimage Sapelkin
+Dmitry Kiselyov
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -117,13 +153,16 @@ Doug Wikle
 Drew Bratcher
 Drew Hintz
 Drew Khoury
+Drini Cami
 Dror BG
 duralog
 eborden
 edsharp
 ekhaled
+Elisée
 Enam Mijbah Noor
 Eric Allam
+Erik Welander
 eustas
 Fabien O'Carroll
 Fabio Zendhi Nagao
@@ -138,43 +177,54 @@ flack
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
+Forrest Oliphant
 Frank Wiegand
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
+Gavin Douglas
 gekkoe
+geowarin
 Gerard Braad
 Gergely Hegykozi
+Giovanni Calò
+Glebov Boris
 Glenn Jorde
 Glenn Ruehle
 Golevka
+Google Inc.
 Gordon Smith
 Grant Skinner
 greengiant
 Gregory Koberger
 Guillaume Massé
 Guillaume Massé
+guraga
 Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Hector Oswaldo Caballero
 Herculano Campos
 Hiroyuki Makino
 hitsthings
 Hocdoc
+Hugues Malphettes
 Ian Beck
 Ian Dickinson
 Ian Wehrman
 Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
+idleberg
 ilvalle
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
+Ivoah
 Jacob Lee
 Jakob Miland
 Jakub Vrana
@@ -186,6 +236,7 @@ Jan Jongboom
 jankeromnes
 Jan Keromnes
 Jan Odvarko
+Jan Schär
 Jan T. Sott
 Jared Forsyth
 Jason
@@ -196,34 +247,49 @@ Jason San Jose
 Jason Siefken
 Jaydeep Solanki
 Jean Boussier
+Jeff Blaisdell
 jeffkenton
 Jeff Pickhardt
 jem (graphite)
 Jeremy Parmenter
+Jim
+JobJob
+jochenberger
 Jochen Berger
 Johan Ask
 John Connor
+John Engler
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jon Ander Peñalba
+Jonas Döbertin
 Jonathan Malmaud
 jongalloway
 Jon Malmaud
 Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
+Josh Cohen
 Joshua Newman
 Josh Watzman
 jots
 jsoojeon
+ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
+Julien Rebetez
+Justin Andresen
 Justin Hileman
 jwallers@gmail.com
 kaniga
+karevn
+Kayur Patel
 Ken Newman
+ken restivo
 Ken Rockot
+Kevin Earls
 Kevin Sawicki
 Kevin Ushey
 Klaus Silveira
@@ -233,6 +299,7 @@ Konstantin Lopuhin
 koops
 ks-ifware
 kubelsmieci
+KwanEsq
 Lanfei
 Lanny
 Laszlo Vidacs
@@ -241,12 +308,16 @@ Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
 Liam Newman
+Libo Cannici
+LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
 Luciano Longo
 Luke Stagner
 lynschinzer
+M1cha
+Madhura Jayaratne
 Maksim Lin
 Maksym Taran
 Malay Majithia
@@ -256,19 +327,28 @@ Marcel Gerber
 Marco Aurélio
 Marco Munizaga
 Marcus Bointon
+Marek Rudnicki
 Marijn Haverbeke
 Mário Gonçalves
 Mario Pietsch
+Mark Anderson
 Mark Lentczner
 Marko Bonaci
+Markus Bordihn
 Martin Balek
 Martín Gaitán
 Martin Hasoň
+Martin Hunt
+Martin Laine
+Martin Zagora
 Mason Malone
 Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
+Matt Gaide
+Matthew Bauer
 Matthew Beale
+Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
 Matt McDonald
@@ -278,14 +358,23 @@ mauricio
 Maximilian Hils
 Maxim Kraev
 Max Kirsch
+Max Schaefer
 Max Xiantu
 mbarkhau
+McBrainy
+melpon
 Metatheos
 Micah Dubinko
+Michael
+Michael Goderbauer
+Michael Grey
+Michael Kaminsky
 Michael Lehenbauer
 Michael Zhou
+Michal Dorner
 Mighty Guava
 Miguel Castillo
+mihailik
 Mike
 Mike Brevoort
 Mike Diaz
@@ -294,20 +383,25 @@ Mike Kadin
 MinRK
 Miraculix87
 misfo
+mkaminsky11
 mloginov
 Moritz Schwörer
 mps
+ms
 mtaran-google
 Narciso Jaramillo
 Nathan Williams
 ndr
 nerbert
 nextrevision
+ngn
 nguillaumin
 Ng Zhi An
 Nicholas Bollweg
 Nicholas Bollweg (Nick)
+Nick Kreeger
 Nick Small
+Nicolò Ribaudo
 Niels van Groningen
 nightwing
 Nikita Beloglazov
@@ -316,37 +410,54 @@ Nikolay Kostov
 nilp0inter
 Nisarg Jhaveri
 nlwillia
+noragrossman
 Norman Rzepka
+Oreoluwa Onatemowo
 pablo
+pabloferz
 Page
 Panupong Pasupat
 paris
+Paris
 Patil Arpith
 Patrick Stoica
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
+Pavel
 Pavel Feldman
 Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
+peter
 Peter Flynn
 peterkroon
 Peter Kroon
+Philipp A
+Philip Stadermann
+Pierre Gerold
+Piët Delport
 prasanthj
 Prasanth J
+Prayag Verma
 Radek Piórkowski
 Rahul
+Rahul Anand
+ramwin1
 Randall Mason
 Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
+ray ratchup
+Ray Ratchup
+Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
 Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
+Rrandom
 Ruslan Osmanov
 Ryan Prior
 sabaca
@@ -355,20 +466,26 @@ sandeepshetty
 Sander AKA Redsandro
 santec
 Sascha Peilicke
+satamas
 satchmorun
 sathyamoorthi
+S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
 Sebastian Zaha
+Sergey Goder
+Se-Won Kim
 shaund
 shaun gilchrist
 Shawn A
+Shea Bunge
 sheopory
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
 silverwind
+sinkuu
 snasa
 soliton4
 sonson
@@ -378,13 +495,23 @@ Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
+Steffen Bruchmann
+Stephen Lavelle
+Steve Champagne
 Steve O'Hara
 stoskov
+Stu Kennedy
+Sungho Kim
+sverweij
 Taha Jahangir
+Tako Schotanus
 Takuji Shimokawa
 Tarmil
+TDaglis
+tel
 tfjgeorge
 Thaddee Tyl
+thanasis
 TheHowl
 think
 Thomas Dvornik
@@ -401,23 +528,31 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+Tristan Tarrant
+TSUYUSATO Kitsune
 twifkak
 Vestimir Markov
 vf
+Victor Bocharsky
 Vincent Woo
 Volker Mische
 wenli
+Wes Cossick
 Wesley Wiser
 Will Binns-Smith
+Will Dean
 William Jamieson
 William Stein
 Willy
 Wojtek Ptak
+Wu Cheng-Han
 Xavier Mendez
 Yassin N. Hassan
 YNH Webdev
 Yunchi Luo
 Yuvi Panda
+Zac Anger
 Zachary Dremann
+Zhang Hao
 zziuni
 魏鹏刚

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/.travis.yml.xml → bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/CHANGELOG.md.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>__name__</string> </key>
-            <value> <string>.travis.yml</string> </value>
+            <value> <string>CHANGELOG.md</string> </value>
         </item>
         <item>
             <key> <string>_vars</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/CONTRIBUTING.md.gen → bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/CONTRIBUTING.md.txt

 # How to contribute
 
-- [Getting help](#getting-help-)
-- [Submitting bug reports](#submitting-bug-reports-)
-- [Contributing code](#contributing-code-)
+- [Getting help](#getting-help)
+- [Submitting bug reports](#submitting-bug-reports)
+- [Contributing code](#contributing-code)
 
 ## Getting help
 
@@ -61,12 +61,24 @@ should be asked on the
 - Make sure all tests pass. Visit `test/index.html` in your browser to
   run them.
 - Submit a pull request
-([how to create a pull request](https://help.github.com/articles/fork-a-repo))
+([how to create a pull request](https://help.github.com/articles/fork-a-repo)).
+  Don't put more than one feature/fix in a single pull request.
+
+By contributing code to CodeMirror you
+
+ - agree to license the contributed code under CodeMirror's [MIT
+   license](http://codemirror.net/LICENSE).
+
+ - confirm that you have the right to contribute and license the code
+   in question. (Either you hold all rights on the code, or the rights
+   holder has explicitly granted the right to use it like this,
+   through a compatible open source license or through a direct
+   agreement with you.)
 
 ### Coding standards
 
 - 2 spaces per indentation level, no tabs.
-- Include semicolons after statements.
+
 - Note that the linter (`bin/lint`) which is run after each commit
   complains about unused variables and functions. Prefix their names
   with an underscore to muffle it.

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/LICENSE.txt

-Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2016 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/README.md.gen

-# CodeMirror
-[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
-
-CodeMirror is a JavaScript component that provides a code editor in
-the browser. When a mode is available for the language you are coding
-in, it will color your code, and optionally help with indentation.
-
-The project page is http://codemirror.net  
-The manual is at http://codemirror.net/doc/manual.html  
-The contributing guidelines are in [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/README.md.txt

+# CodeMirror
+[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
+[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
+[![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
+[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
+
+CodeMirror is a versatile text editor implemented in JavaScript for
+the browser. It is specialized for editing code, and comes with over
+100 language modes and various addons that implement more advanced
+editing functionality.
+
+A rich programming API and a CSS theming system are available for
+customizing CodeMirror to fit your application, and extending it with
+new functionality.
+
+You can find more information (and the
+[manual](http://codemirror.net/doc/manual.html)) on the [project
+page](http://codemirror.net). For questions and discussion, use the
+[discussion forum](https://discuss.codemirror.net/).
+
+See
+[CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
+for contributing guidelines.
+
+The CodeMirror community aims to be welcoming to everybody. We use the
+[Contributor Covenant
+(1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
+conduct.

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/closebrackets.js.js

@@ -9,27 +9,168 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-  var DEFAULT_BRACKETS = "()[]{}''\"\"";
-  var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
-  var SPACE_CHAR_REGEX = /\s/;
+  var defaults = {
+    pairs: "()[]{}''\"\"",
+    triples: "",
+    explode: "[]{}"
+  };
 
   var Pos = CodeMirror.Pos;
 
   CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    if (old != CodeMirror.Init && old)
-      cm.removeKeyMap("autoCloseBrackets");
-    if (!val) return;
-    var pairs = DEFAULT_BRACKETS, explode = DEFAULT_EXPLODE_ON_ENTER;
-    if (typeof val == "string") pairs = val;
-    else if (typeof val == "object") {
-      if (val.pairs != null) pairs = val.pairs;
-      if (val.explode != null) explode = val.explode;
+    if (old && old != CodeMirror.Init) {
+      cm.removeKeyMap(keyMap);
+      cm.state.closeBrackets = null;
+    }
+    if (val) {
+      cm.state.closeBrackets = val;
+      cm.addKeyMap(keyMap);
     }
-    var map = buildKeymap(pairs);
-    if (explode) map.Enter = buildExplodeHandler(explode);
-    cm.addKeyMap(map);
   });
 
+  function getOption(conf, name) {
+    if (name == "pairs" && typeof conf == "string") return conf;
+    if (typeof conf == "object" && conf[name] != null) return conf[name];
+    return defaults[name];
+  }
+
+  var bind = defaults.pairs + "`";
+  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+  for (var i = 0; i < bind.length; i++)
+    keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
+
+  function handler(ch) {
+    return function(cm) { return handleChar(cm, ch); };
+  }
+
+  function getConfig(cm) {
+    var deflt = cm.state.closeBrackets;
+    if (!deflt) return null;
+    var mode = cm.getModeAt(cm.getCursor());
+    return mode.closeBrackets || deflt;
+  }
+
+  function handleBackspace(cm) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var cur = ranges[i].head;
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
+    }
+  }
+
+  function handleEnter(cm) {
+    var conf = getConfig(cm);
+    var explode = conf && getOption(conf, "explode");
+    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    cm.operation(function() {
+      cm.replaceSelection("\n\n", null);
+      cm.execCommand("goCharLeft");
+      ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var line = ranges[i].head.line;
+        cm.indentLine(line, null, true);
+        cm.indentLine(line + 1, null, true);
+      }
+    });
+  }
+
+  function contractSelection(sel) {
+    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
+    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
+            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
+  }
+
+  function handleChar(cm, ch) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var pos = pairs.indexOf(ch);
+    if (pos == -1) return CodeMirror.Pass;
+    var triples = getOption(conf, "triples");
+
+    var identical = pairs.charAt(pos + 1) == ch;
+    var ranges = cm.listSelections();
+    var opening = pos % 2 == 0;
+
+    var type, next;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], cur = range.head, curType;
+      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+      if (opening && !range.empty()) {
+        curType = "surround";
+      } else if ((identical || !opening) && next == ch) {
+        if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+          curType = "skipThree";
+        else
+          curType = "skip";
+      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
+                 (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
+        curType = "addFour";
+      } else if (identical) {
+        if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
+        else return CodeMirror.Pass;
+      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
+                             isClosingBracket(next, pairs) ||
+                             /\s/.test(next))) {
+        curType = "both";
+      } else {
+        return CodeMirror.Pass;
+      }
+      if (!type) type = curType;
+      else if (type != curType) return CodeMirror.Pass;
+    }
+
+    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
+    cm.operation(function() {
+      if (type == "skip") {
+        cm.execCommand("goCharRight");
+      } else if (type == "skipThree") {
+        for (var i = 0; i < 3; i++)
+          cm.execCommand("goCharRight");
+      } else if (type == "surround") {
+        var sels = cm.getSelections();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = left + sels[i] + right;
+        cm.replaceSelections(sels, "around");
+        sels = cm.listSelections().slice();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = contractSelection(sels[i]);
+        cm.setSelections(sels);
+      } else if (type == "both") {
+        cm.replaceSelection(left + right, null);
+        cm.triggerElectric(left + right);
+        cm.execCommand("goCharLeft");
+      } else if (type == "addFour") {
+        cm.replaceSelection(left + left + left + left, "before");
+        cm.execCommand("goCharRight");
+      }
+    });
+  }
+
+  function isClosingBracket(ch, pairs) {
+    var pos = pairs.lastIndexOf(ch);
+    return pos > -1 && pos % 2 == 1;
+  }
+
   function charsAround(cm, pos) {
     var str = cm.getRange(Pos(pos.line, pos.ch - 1),
                           Pos(pos.line, pos.ch + 1));
@@ -51,109 +192,4 @@
       stream.start = stream.pos;
     }
   }
-
-  function buildKeymap(pairs) {
-    var map = {
-      name : "autoCloseBrackets",
-      Backspace: function(cm) {
-        if (cm.getOption("disableInput")) return CodeMirror.Pass;
-        var ranges = cm.listSelections();
-        for (var i = 0; i < ranges.length; i++) {
-          if (!ranges[i].empty()) return CodeMirror.Pass;
-          var around = charsAround(cm, ranges[i].head);
-          if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-        }
-        for (var i = ranges.length - 1; i >= 0; i--) {
-          var cur = ranges[i].head;
-          cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
-        }
-      }
-    };
-    var closingBrackets = "";
-    for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      closingBrackets += right;
-      map["'" + left + "'"] = function(cm) {
-        if (cm.getOption("disableInput")) return CodeMirror.Pass;
-        var ranges = cm.listSelections(), type, next;
-        for (var i = 0; i < ranges.length; i++) {
-          var range = ranges[i], cur = range.head, curType;
-          var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-          if (!range.empty()) {
-            curType = "surround";
-          } else if (left == right && next == right) {
-            if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
-              curType = "skipThree";
-            else
-              curType = "skip";
-          } else if (left == right && cur.ch > 1 &&
-                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
-                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
-            curType = "addFour";
-          } else if (left == '"' || left == "'") {
-            if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
-            else return CodeMirror.Pass;
-          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next)) {
-            curType = "both";
-          } else {
-            return CodeMirror.Pass;
-          }
-          if (!type) type = curType;
-          else if (type != curType) return CodeMirror.Pass;
-        }
-
-        cm.operation(function() {
-          if (type == "skip") {
-            cm.execCommand("goCharRight");
-          } else if (type == "skipThree") {
-            for (var i = 0; i < 3; i++)
-              cm.execCommand("goCharRight");
-          } else if (type == "surround") {
-            var sels = cm.getSelections();
-            for (var i = 0; i < sels.length; i++)
-              sels[i] = left + sels[i] + right;
-            cm.replaceSelections(sels, "around");
-          } else if (type == "both") {
-            cm.replaceSelection(left + right, null);
-            cm.execCommand("goCharLeft");
-          } else if (type == "addFour") {
-            cm.replaceSelection(left + left + left + left, "before");
-            cm.execCommand("goCharRight");
-          }
-        });
-      };
-      if (left != right) map["'" + right + "'"] = function(cm) {
-        var ranges = cm.listSelections();
-        for (var i = 0; i < ranges.length; i++) {
-          var range = ranges[i];
-          if (!range.empty() ||
-              cm.getRange(range.head, Pos(range.head.line, range.head.ch + 1)) != right)
-            return CodeMirror.Pass;
-        }
-        cm.execCommand("goCharRight");
-      };
-    })(pairs.charAt(i), pairs.charAt(i + 1));
-    return map;
-  }
-
-  function buildExplodeHandler(pairs) {
-    return function(cm) {
-      if (cm.getOption("disableInput")) return CodeMirror.Pass;
-      var ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        if (!ranges[i].empty()) return CodeMirror.Pass;
-        var around = charsAround(cm, ranges[i].head);
-        if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-      }
-      cm.operation(function() {
-        cm.replaceSelection("\n\n", null);
-        cm.execCommand("goCharLeft");
-        ranges = cm.listSelections();
-        for (var i = 0; i < ranges.length; i++) {
-          var line = ranges[i].head.line;
-          cm.indentLine(line, null, true);
-          cm.indentLine(line + 1, null, true);
-        }
-      });
-    };
-  }
 });

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/closebrackets.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897295.56</string> </value>
+            <value> <string>ts60604371.88</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -28,7 +28,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>6302</int> </value>
+            <value> <int>6945</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/closetag.js.js

@@ -94,33 +94,36 @@
     }
   }
 
-  function autoCloseSlash(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+  function autoCloseCurrent(cm, typingSlash) {
     var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
     for (var i = 0; i < ranges.length; i++) {
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-      if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-          tok.start != pos.ch - 1)
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
         return CodeMirror.Pass;
       // Kludge to get around the fact that we are not in XML mode
       // when completing in JS/CSS snippet in htmlmixed mode. Does not
       // work for other XML embedded languages (there is no general
       // way to go from a mixed mode to its current XML state).
+      var replacement;
       if (inner.mode.name != "xml") {
         if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
-          replacements[i] = "/script>";
+          replacement = head + "script";
         else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
-          replacements[i] = "/style>";
+          replacement = head + "style";
         else
           return CodeMirror.Pass;
       } else {
         if (!state.context || !state.context.tagName ||
             closingTagExists(cm, state.context.tagName, pos, state))
           return CodeMirror.Pass;
-        replacements[i] = "/" + state.context.tagName + ">";
+        replacement = head + state.context.tagName;
       }
+      if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
+      replacements[i] = replacement;
     }
     cm.replaceSelections(replacements);
     ranges = cm.listSelections();
@@ -129,6 +132,13 @@
         cm.indentLine(ranges[i].head.line);
   }
 
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    return autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
   function indexOf(collection, elt) {
     if (collection.indexOf) return collection.indexOf(elt);
     for (var i = 0, e = collection.length; i < e; ++i)

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/closetag.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897295.63</string> </value>
+            <value> <string>ts60604371.94</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -28,7 +28,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>7331</int> </value>
+            <value> <int>7705</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/continuelist.js.js

@@ -11,36 +11,36 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)\.)(\s*)/,
-      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)\.)(\s*)$/,
+  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,
       unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head, match;
+      var pos = ranges[i].head;
       var eolState = cm.getStateAfter(pos.line);
       var inList = eolState.list !== false;
-      var inQuote = eolState.quote !== false;
+      var inQuote = eolState.quote !== 0;
 
-      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
+      var line = cm.getLine(pos.line), match = listRE.exec(line);
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match) {
         cm.execCommand("newlineAndIndent");
         return;
       }
-      if (cm.getLine(pos.line).match(emptyListRE)) {
+      if (emptyListRE.test(line)) {
         cm.replaceRange("", {
           line: pos.line, ch: 0
         }, {
           line: pos.line, ch: pos.ch + 1
         });
         replacements[i] = "\n";
-
       } else {
-        var indent = match[1], after = match[4];
+        var indent = match[1], after = match[5];
         var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
           ? match[2]
-          : (parseInt(match[3], 10) + 1) + ".";
+          : (parseInt(match[3], 10) + 1) + match[4];
 
         replacements[i] = "\n" + indent + bullet + after;
       }

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/continuelist.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897295.78</string> </value>
+            <value> <string>ts60604371.99</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -28,7 +28,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>1752</int> </value>
+            <value> <int>1761</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/matchbrackets.js.js

@@ -81,7 +81,7 @@
     if (marks.length) {
       // Kludge to work around the IE bug from issue #1193, where text
       // input stops going to the textare whever this fires.
-      if (ie_lt8 && cm.state.focused) cm.display.input.focus();
+      if (ie_lt8 && cm.state.focused) cm.focus();
 
       var clear = function() {
         cm.operation(function() {

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/matchbrackets.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897295.92</string> </value>
+            <value> <string>ts60604372.04</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -28,7 +28,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>5268</int> </value>
+            <value> <int>5254</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/codemirror/addon/cm_edit/matchtags.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts21897296.03</string> </value>
+            <value> <string>ts60604372.1</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>