update ChangeLog

ajaxorg · Nov 5, 2014 · 96061f7 · 96061f7
1 parent 70337ea
commit 96061f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,8 +1,15 @@
-
+
+
 * API Changes
   - `editor.commands.commandKeyBinding` now contains direct map from keys to commands instead of grouping them by hashid
-  - 
 
+* New Features
+  - Improved autoindent for html and php modes (Adam Jimenez)
+  - Find All from searchbox (Colton Voege)
+
+* new language modes
+  - Elixir, Elm
+
 2014.09.21 Version 1.1.7
 
 * Bugfixes

diff --git a/tool/tmlanguage.js b/tool/tmlanguage.js
@@ -107,7 +107,7 @@ function convertToNonCapturingGroups(str) {
 
 function simplifyNonCapturingGroups(str) {
     var tokens = tokenize(str);
-    var t = tokens[0];
+    var t = tokens[0] || {};
     if (t.type == "group.start" && t.value == "(?:"
         && t.end == last(tokens)) {
         t.value = t.end.value = "";