diff --git a/settings/language-lua.cson b/settings/language-lua.cson
index ad3acab..5cb7c0a 100644
--- a/settings/language-lua.cson
+++ b/settings/language-lua.cson
@@ -1,5 +1,5 @@
 '.source.lua':
   'editor':
     'commentStart': '-- '
-    'increaseIndentPattern': '\\b(else|elseif|(local\\s+)?function|then|do|repeat)\\b((?!end).)*$|\\{\\s*$'
-    'decreaseIndentPattern': '^\\s*(elseif|else|end|until,?|\\}\\)?).*$'
+    'increaseIndentPattern': '((\\b(else|function|then|do|repeat)\\b((?!\\b(end|until)\\b).)*)|(\\{\\s*))$'
+    'decreaseIndentPattern': '^\\s*((\\b(elseif|else|end|until)\\b)|(\\})|(\\)))'