aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-04-02 03:05:58 -0700
committerJakob Odersky <jakob@odersky.com>2016-04-02 03:05:58 -0700
commit440805837aece90b9969e8a6c606799acfcddcab (patch)
tree6b648afe97dcfe7a07f8772123cbe92407be8c32
parenta84101ab57420696b6a15d67083153d61b47d66c (diff)
downloaddotfiles-440805837aece90b9969e8a6c606799acfcddcab.tar.gz
dotfiles-440805837aece90b9969e8a6c606799acfcddcab.tar.bz2
dotfiles-440805837aece90b9969e8a6c606799acfcddcab.zip
Update scala config
-rw-r--r--home/.emacs.d/config/scala.el14
1 files changed, 6 insertions, 8 deletions
diff --git a/home/.emacs.d/config/scala.el b/home/.emacs.d/config/scala.el
index b8a55cd..e13e623 100644
--- a/home/.emacs.d/config/scala.el
+++ b/home/.emacs.d/config/scala.el
@@ -2,21 +2,19 @@
:interpreter
("scala" . scala-mode)
:config
- ;; BUG https://github.com/Fuco1/smartparens/issues/468
- ;; backwards/next not working particularly well
-
- ;; i.e. bypass company-mode
- (bind-key "C-<tab>" 'dabbrev-expand scala-mode-map)
- (bind-key "C-c e" 'next-error scala-mode-map)
(add-hook 'scala-mode-hook
(lambda ()
(local-set-key (kbd "RET") '(lambda ()
(interactive)
(newline-and-indent)
(scala-indent:insert-asterisk-on-multiline-comment)))
- (local-set-key (kbd "<backtab>") 'scala-indent:indent-with-reluctant-strategy)
(setq fill-column 100)
- (ensime-mode))))
+ (ensime-mode)))
+ :bind (:map scala-mode-map
+ ("C-<tab>" . dabbrev-expand)
+ ("<backtab>" . scala-indent:indent-with-reluctant-strategy))
+
+ )
;; ENhanced Scala Interaction Mode for text Editors
(use-package ensime