remove tuareg mode initializations

[.emacs.d.git] / init.el

diff --git a/init.el b/init.el
index 9f0ad8b5cd58c2881f7d46b0bdf0130fba64dea2..cb5f497ffc9df7fc19fc0169e2e0e73ea67e4202 100644 (file)
--- a/init.el
+++ b/init.el
@@ -16,7 +16,7 @@
 (setq visible-bell t)
 
 ;; This is bound to f11 in Emacs 24.4
-;; (toggle-frame-fullscreen) 
+;; (toggle-frame-fullscreen)
 (custom-set-variables
  '(initial-frame-alist (quote ((fullscreen . maximized)))))
 ;; Who use the bar to scroll?
@@ -35,7 +35,7 @@
              '("marmalade" . "http://marmalade-repo.org/packages/") t)
 (package-initialize)
 
-; fetch the list of packages available 
+; fetch the list of packages available
 (unless package-archive-contents
   (package-refresh-contents))
 
@@ -83,34 +83,29 @@
 ;; haskell mode
 (setenv "PATH" (concat "~/.cabal/bin:" (getenv "PATH")))
 (add-to-list 'exec-path "~/.cabal/bin")
-;; (add-hook 'haskell-mode-hook 'haskell-indent-mode)
+(add-hook 'haskell-mode-hook 'haskell-indent-mode)
 ;; (add-hook 'haskell-mode-hook 'interactive-haskell-mode)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
-
-;; ocaml
-(add-hook 'tuareg-mode-hook 'tuareg-imenu-set-imenu)
-(setq auto-mode-alist
-      (append '(("\\.ml[ily]?$" . tuareg-mode)
-                ("\\.topml$" . tuareg-mode))
-              auto-mode-alist))
-(autoload 'utop-setup-ocaml-buffer "utop" "Toplevel for OCaml" t)
-(add-hook 'tuareg-mode-hook 'utop-setup-ocaml-buffer)
-(add-hook 'tuareg-mode-hook 'merlin-mode)
-;; Start merlin on ocaml files
-(add-hook 'caml-mode-hook 'merlin-mode t)
-;; Enable auto-complete
-(setq merlin-use-auto-complete-mode 'easy)
-;; Use opam switch to lookup ocamlmerlin binary
-(setq merlin-command 'opam)
-(setq merlin-error-after-save nil)
-
-;; ocp-indent
-;; (add-to-list 'load-path "/Users/ramakrishnanm/.opam/4.02.1/share/emacs/site-lisp")
-;; (require 'ocp-indent)
+;; (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
+;; (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
 
 ;; ghc-mod
 (autoload 'ghc-init "ghc" nil t)
 (autoload 'ghc-debug "ghc" nil t)
 (add-hook 'haskell-mode-hook (lambda () (ghc-init)))
-  
+
+;; ido
+(setq ido-enable-flex-matching t)
+(setq ido-everywhere t)
+(ido-mode 1)
+
+;; disable tabs for indentation
+(setq-default indent-tabs-mode nil)
+
+(require 'whitespace)
+(setq whitespace-style '(face lines-tail))
+(setq whitespace-line-column 80)
+(global-whitespace-mode t)
+
+;; show trailing whitespaces
+(setq-default show-trailing-whitespace t)
+(setq-default indicate-empty-lines t)