branch: elpa/scala-mode
commit 54fa36f69fb0e683b48f02d29581cfca66f64445
Merge: 46bb948 e0341e9
Author: Heikki Vesalainen <heikkivesalai...@yahoo.com>
Commit: GitHub <nore...@github.com>
Merge pull request #159 from kpbochenek/fix-files-association-alist
Recognize worksheets as scala files
---
scala-mode.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scala-mode.el b/scala-mode.el
index bfe55f3..fecf4fb 100644
--- a/scala-mode.el
+++ b/scala-mode.el
@@ -175,8 +175,8 @@ When started, runs `scala-mode-hook'.
;;;###autoload
(progn
(add-to-list 'auto-mode-alist
- '("\\.\\(scala\\|sbt\\)\\'" . scala-mode))
- (modify-coding-system-alist 'file "\\.\\(scala\\|sbt\\)\\'" 'utf-8))
+ '("\\.\\(scala\\|sbt\\|worksheet\\.sc\\)\\'" . scala-mode))
+ (modify-coding-system-alist 'file "\\.\\(scala\\|sbt\\|worksheet\\.sc\\)\\'"
'utf-8))
(provide 'scala-mode)
;;; scala-mode.el ends here
