Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CodeMirror
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

87e8df8c

Commit 87e8df8c authored 11 years ago by Marijn Haverbeke

Downloads
- Plain Diff

Merge branch 'master' into v4

Conflicts:
	lib/codemirror.js

parents 9245ce92 e993d32d

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

addon/merge/merge.js 15 additions, 0 deletions

addon/merge/merge.js
demo/complete.html 2 additions, 1 deletion

demo/complete.html
keymap/vim.js 100 additions, 106 deletions

keymap/vim.js
lib/codemirror.js 9 additions, 5 deletions

lib/codemirror.js
mode/javascript/javascript.js 2 additions, 1 deletion

mode/javascript/javascript.js
mode/sql/index.html 2 additions, 1 deletion

mode/sql/index.html
mode/sql/sql.js 11 additions, 0 deletions

mode/sql/sql.js
test/vim_test.js 115 additions, 34 deletions

test/vim_test.js

with 256 additions and 148 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment