From 96061f72aef6f63843642b84b11518ddb3768870 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 5 Nov 2014 16:51:34 +0400
Subject: [PATCH] update ChangeLog

---
 ChangeLog.txt      | 11 +++++++++--
 tool/tmlanguage.js |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7c3db96d..86399b5e 100644
--- 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
index d3e42141..9261a2f1 100644
--- 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 = "";