jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into worker

Browse source 
Conflicts:
	lib/ace/css/editor.css
This commit is contained in:
nightwing 2012-10-01 23:29:11 +04:00
commit cbfb690a2e
170 changed files with 8597 additions and 4188 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/edit_session.js
View file

@ -378,7 +378,7 @@ var EditSession = function(text, mode) {
this.highlight = function(re) {
if (!this.$searchHighlight) {
var highlight = new SearchHighlight(null, "ace_selected_word", "text");
var highlight = new SearchHighlight(null, "ace_selected-word", "text");
this.$searchHighlight = this.addDynamicMarker(highlight);
}
this.$searchHighlight.setRegexp(re);