From: Ramakrishnan Muthukrishnan Date: Wed, 24 Dec 2014 09:33:46 +0000 (+0530) Subject: remove tuareg mode initializations X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=4ac07cc556f81dfd96ebb36bdbe00b73b9807ee2;p=.emacs.d.git remove tuareg mode initializations --- diff --git a/init.el b/init.el index 7a55c5e..cb5f497 100644 --- a/init.el +++ b/init.el @@ -83,31 +83,10 @@ ;; 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) @@ -130,4 +109,3 @@ ;; show trailing whitespaces (setq-default show-trailing-whitespace t) (setq-default indicate-empty-lines t) -