[nongnu] elpa/scala-mode 730e16d 186/217: Merge pull request #130 from ensime/fix/120

[ELPA Syncer]

branch: elpa/scala-mode
commit 730e16d254478d6f63f62cb04d47c137c9002f2d
Merge: 5ffaa1f b67029a
Author: Heikki Vesalainen <heikki.vesalainen@iki.fi>
Commit: GitHub <noreply@github.com>

    Merge pull request #130 from ensime/fix/120
    
    fix #120, align according to forms
---
 scala-mode-indent.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index ca549e2..24c68c1 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -529,8 +529,8 @@ condition (or generators in the case of 'for') in 
parentheses.")
   "Other flow control keywords (not followed by parentheses)")
 
 (defconst scala-indent:control-keywords-re
-  (concat scala-indent:control-keywords-cond-re
-          scala-indent:control-keywords-other-re))
+  (concat "\\(" scala-indent:control-keywords-cond-re
+          "\\|" scala-indent:control-keywords-other-re "\\)"))
 
 (defun scala-indent:body-p (&optional point)
   "Returns the position of '=' symbol, or one of the