From 79f619364a15b230e1d2afbfae84ce7bdbd04d9a Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 23 Mar 2014 15:19:24 +0400
Subject: [PATCH] clenup

---
 lib/ace/autocomplete.js | 11 ++++-------
 lib/ace/tokenizer.js    |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/ace/autocomplete.js b/lib/ace/autocomplete.js
index 35c5aaa8..f3800c16 100644
--- a/lib/ace/autocomplete.js
+++ b/lib/ace/autocomplete.js
@@ -181,11 +181,9 @@ var Autocomplete = function() {
         "Esc": function(editor) { editor.completer.detach(); },
         "Space": function(editor) { editor.completer.detach(); editor.insert(" ");},
         "Return": function(editor) {
-            if (editor.completer.popup.getRow() > -1) {
-                editor.completer.insertMatch();
-            } else {
-                editor.insert("\n");
-            }
+            if (editor.completer.popup.getRow() == -1)
+                return false;
+            editor.completer.insertMatch();
         },
         "Shift-Return": function(editor) { editor.completer.insertMatch(true); },
         "Tab": function(editor) { editor.completer.insertMatch(); },
@@ -290,8 +288,7 @@ var Autocomplete = function() {
                 return doDetach();
 
             // Wrong prefix or wrong session -> ignore
-            if (prefix.indexOf(results.prefix) != 0
-            || _id != this.gatherCompletionsId)
+            if (prefix.indexOf(results.prefix) != 0 || _id != this.gatherCompletionsId)
                 return;
 
             this.completions = new FilteredList(matches);
diff --git a/lib/ace/tokenizer.js b/lib/ace/tokenizer.js
index 6711152e..72989766 100644
--- a/lib/ace/tokenizer.js
+++ b/lib/ace/tokenizer.js
@@ -114,7 +114,6 @@ var Tokenizer = function(rules) {
             // makes property access faster
             if (!rule.onMatch)
                 rule.onMatch = null;
-            rule.__proto__ = null;
         }
         
         splitterRurles.forEach(function(rule) {