branch: elpa/scala-mode
commit 7e6300231143133252e6ed1f3d5c86ea4e625e33
Author: Aleksandr Ivanov <4le...@gmail.com>
Commit: Sam Halliday <sam.halli...@gmail.com>
Add "inline" keyword from scalameta (#128)
---
scala-mode-indent.el | 2 +-
scala-mode-syntax.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index cc59e96..b7eab82 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -243,7 +243,7 @@ and the empty line")
(regexp-opt '("abstract" "catch" "case" "class" "def" "do" "else" "final"
"finally" "for" "if" "implicit" "import" "lazy" "new" "object"
"override" "package" "private" "protected" "return" "sealed"
- "throw" "trait" "try" "type" "val" "var" "while" "yield")
+ "throw" "trait" "try" "type" "val" "var" "while" "yield"
"inline")
'words)
"Words that we don't want to continue the previous line")
diff --git a/scala-mode-syntax.el b/scala-mode-syntax.el
index c0b6277..fd923ca 100644
--- a/scala-mode-syntax.el
+++ b/scala-mode-syntax.el
@@ -287,7 +287,7 @@
"final" "finally" "for" "forSome" "if" "implicit" "import"
"lazy" "match" "new" "object" "override" "package" "private"
"protected" "return" "sealed" "throw" "trait" "try" "type"
- "val" "var" "while" "with" "yield") 'words))
+ "val" "var" "while" "with" "yield" "inline") 'words))
(defconst scala-syntax:other-keywords-re
(concat "\\(^\\|[^`'_]\\)\\(" scala-syntax:other-keywords-unsafe-re "\\)"))
