Merge pull request #1256 from Korpch/patch-1

fix "char" is reserved word in bracket_match.js
ajaxorg · Feb 16, 2013 · f826283 · f826283
2 parents bc599f2 + 2632685
commit f826283
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ace/edit_session/bracket_match.js b/lib/ace/edit_session/bracket_match.js
@@ -37,10 +37,10 @@ var Range = require("../range").Range;
 
 function BracketMatch() {
 
-    this.findMatchingBracket = function(position, char) {
+    this.findMatchingBracket = function(position, chr) {
         if (position.column == 0) return null;
 
-        var charBeforeCursor = char || this.getLine(position.row).charAt(position.column-1);
+        var charBeforeCursor = chr || this.getLine(position.row).charAt(position.column-1);
         if (charBeforeCursor == "") return null;
 
         var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/);