adobe/CodeMirror2 — pull request #59 by njx (2012-06-06 01:52:43+00:00)
Title: Merge with upstream CodeMirror master for sprint 10

@gruehle

The main changes to review are in lib/codemirror.css and lib/codemirror.js. I'd suggest comparing these against both our previous master (in adobe/CodeMirror2) to see what's changed relative to our previous state, and the upstream master (in marijnh/CodeMirror2) to make sure that our state after the merge will be relatively clean compared to upstream.

I'll add some comments to this pull request around areas that looked tricky in the merge.

See also https://github.com/adobe/brackets/pull/1003 for changes in Brackets necessary to work with the new CodeMirror.