goodbye scala

customizations/modes.el

@@ -44,7 +44,7 @@
 ;; allow us to look at whitespace
 (require 'whitespace)
 (require 'show-wspace)
-(add-hook 'font-lock-mode-hook 'show-ws-highlight-tabs)
+;(add-hook 'font-lock-mode-hook 'show-ws-highlight-tabs)
 
 ;; relax ng
 (require 'rnc-mode)
@@ -74,15 +74,8 @@
 ;; (load "~/.emacs.d/nxml-mode-20041004/rng-auto.el")
 ;; FIXME: get rng-mode working.
 
-;; scala-mode
-;;(require 'scala-mode-auto)
-;;(define-key scala-mode-map (kbd "M-q") 'c-fill-paragraph)
-
 (require 'font-lock)
 
-;; building scala with sbt
-;(load "~/.emacs.d/support/sbt.el")
-
 ;; thrift-mode
 ;(require 'thrift-mode)
 
@@ -157,18 +150,6 @@
         (add-to-list 'auto-mode-alist item))
       my-modes)
 
-;; Load the ensime lisp code...
-(add-to-list 'load-path "/Users/stevej/local/ensime/elisp")
-(require 'ensime)
-
-;; This step causes the ensime-mode to be started whenever
-;; scala-mode is started for a buffer. You may have to customize this step
-;; if you're not using the standard scala mode.
-(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
-
-;; MINI HOWTO:
-;; Open .scala file. M-x ensime (once per project)
-
 ;; allows me to use emacs-client correctly.
 ;; export EDITOR=/Applications/Emacs.app/Contents/MacOS/bin/emacsclient
 (server-start)

init.el

@@ -56,7 +56,6 @@
 (vendor 'rvm)
 (vendor 'ruby-mode)
 (vendor 'rust-mode)
-;(vendor 'scala-mode)
 (vendor 'scion)
 (vendor 'smart-tab)
 (vendor 'smex)
@@ -88,7 +87,6 @@
  ;; If there is more than one, they won't work right.
  '(blink-cursor-mode t)
  '(column-number-mode t)
- '(ensime-sbt-program-name "/Users/stevej/bin/sbt")
  '(js2-basic-offset 2)
  '(quack-programs (quote ("klisp" "/Users/stevej/bin/mzscheme" "bigloo" "csi" "csi -hygienic" "gosh" "gsi" "gsi ~~/syntax-case.scm -" "guile" "kawa" "mit-scheme" "mred -z" "mzscheme" "mzscheme -M errortrace" "mzscheme -il r6rs" "mzscheme -il typed-scheme" "mzscheme3m" "mzschemecgc" "rs" "scheme" "scheme48" "scsh" "sisc" "stklos" "sxi")))
  '(quack-remap-find-file-bindings-p nil)