# HG changeset patch # User Luke Hoersten # Date 1428196801 18000 # Node ID 65194c801e61ac901f1132bac4d52ecbd56acb23 # Parent b5976ed7311a88f325b3f32d8706dd9da6f52b49 Tons of updates. diff -r b5976ed7311a -r 65194c801e61 elisp/haskell-init.el --- a/elisp/haskell-init.el Wed Feb 04 11:05:42 2015 -0600 +++ b/elisp/haskell-init.el Sat Apr 04 20:20:01 2015 -0500 @@ -3,13 +3,7 @@ ;; Require packages (require 'package-require) -(package-require '(haskell-mode hi2 flycheck)) ;; flycheck-haskell hindent shm - -(require 'flycheck) - -;; (eval-after-load 'flycheck -;; '(add-hook 'flycheck-mode-hook #'flycheck-haskell-setup)) -;; (require 'flycheck-haskell) +(package-require '(haskell-mode flycheck)) ;; flycheck-haskell hindent shm (require 'haskell) (require 'haskell-mode) @@ -58,20 +52,21 @@ (imenu-add-menubar-index) (flycheck-mode) (flycheck-disable-checker `haskell-ghc) - (turn-on-hi2) - (interactive-haskell-mode))) + (haskell-indentation-mode t) + (subword-mode) + (interactive-haskell-mode t))) (custom-set-variables '(capitalized-words-mode t) '(haskell-stylish-on-save t) - '(hi2-layout-offset 4) - '(hi2-left-offset 4) + '(haskell-indentation-layout-offset 4) + '(haskell-indentation-left-offset 4) '(haskell-process-type 'cabal-repl) - '(haskell-process-args-cabal-repl '("--ghc-option=-ferror-spans" "--with-ghc=ghci-ng")) - '(haskell-process-path-ghci "ghci-ng") - '(haskell-process-args-ghci "-ferror-spans") + ;; '(haskell-process-args-cabal-repl '("--ghc-option=-ferror-spans" "--with-ghc=ghci-ng")) + ;; '(haskell-process-path-ghci "ghci-ng") + ;; '(haskell-process-args-ghci "-ferror-spans") '(haskell-process-suggest-remove-import-lines t) '(haskell-process-auto-import-loaded-modules t) '(haskell-process-log t) @@ -84,7 +79,7 @@ '(haskell-notify-p t) '(haskell-align-imports-pad-after-name t) - '(haskell-ask-also-kill-buffers t) + '(haskell-ask-also-kill-buffers nil) '(haskell-import-mapping t) '(haskell-interactive-mode-eval-pretty t) @@ -96,11 +91,11 @@ (define-key interactive-haskell-mode-map (kbd "M-,") 'haskell-who-calls) (define-key interactive-haskell-mode-map (kbd "M-.") 'haskell-mode-goto-loc) (define-key interactive-haskell-mode-map (kbd "C-?") 'haskell-mode-find-uses) +(define-key interactive-haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) +(define-key interactive-haskell-mode-map (kbd "C-c C-t") 'haskell-mode-show-type-at) (define-key interactive-haskell-mode-map (kbd "C-`") 'haskell-interactive-bring) -(define-key interactive-haskell-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) -(define-key interactive-haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) +(define-key interactive-haskell-mode-map (kbd "C-c C-k") 'haskell-process-clear) (define-key interactive-haskell-mode-map (kbd "C-c c") 'haskell-process-cabal) -(define-key interactive-haskell-mode-map (kbd "C-c C-t") 'haskell-mode-show-type-at) (define-key haskell-interactive-mode-map (kbd "C-c C-i") 'haskell-process-do-info) (define-key haskell-interactive-mode-map (kbd "C-") 'haskell-interactive-mode-error-backward) @@ -110,61 +105,18 @@ (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload) (define-key haskell-mode-map (kbd "C-`") 'haskell-interactive-bring) (define-key haskell-mode-map (kbd "C-c C-t") 'haskell-process-do-type) +(define-key haskell-mode-map (kbd "C-c i") 'haskell-navigate-imports) (define-key haskell-mode-map (kbd "C-c C-i") 'haskell-process-do-info) (define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) (define-key haskell-mode-map (kbd "C-c C-d") 'haskell-describe) -(define-key haskell-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) +(define-key haskell-mode-map (kbd "C-c C-k") 'haskell-process-clear) (define-key haskell-mode-map (kbd "C-c c") 'haskell-process-cabal) (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space) (define-key haskell-cabal-mode-map (kbd "C-`") 'haskell-interactive-bring) -(define-key haskell-cabal-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) +(define-key haskell-cabal-mode-map (kbd "C-c C-k") 'haskell-process-clear) (define-key haskell-cabal-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) (define-key haskell-cabal-mode-map (kbd "C-c c") 'haskell-process-cabal) (message "Loading haskell-init...done") (provide 'haskell-init) - - -;;;; Old haskell stuff -;; ;;; haskell-mode -;; (autoload 'ghc-init "ghc" nil t) -;; (add-hook -;; 'haskell-mode-hook -;; (lambda () -;; (ghc-init) -;; (capitalized-words-mode t) -;; (turn-on-hi2) -;; (imenu-add-menubar-index) -;; (interactive-haskell-mode) -;; (local-set-key (kbd "C-c i") 'haskell-navigate-imports) ; go to imports. prefix to return -;; (local-set-key (kbd "M-p") 'move-line-up) ; need to override default M-p function -;; (local-set-key (kbd "M-n") 'move-line-down) -;; (local-set-key (kbd "C-1") 'ghc-display-errors) -;; (local-set-key (kbd "C-.") 'ghc-goto-next-error) -;; (local-set-key (kbd "C-,") 'ghc-goto-prev-error) - -;; (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload) -;; (define-key haskell-mode-map (kbd "C-`") 'haskell-interactive-bring) -;; (define-key haskell-mode-map (kbd "C-c C-t") 'haskell-process-do-type) -;; (define-key haskell-mode-map (kbd "C-c C-i") 'haskell-process-do-info) -;; (define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) -;; (define-key haskell-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) -;; (define-key haskell-mode-map (kbd "C-c c") 'haskell-process-cabal) -;; (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space) - -;; (setq -;; ghc-ghc-options '("-isrc") -;; haskell-program-name "cabal repl" -;; haskell-stylish-on-save t -;; hi2-layout-offset 4 -;; hi2-left-offset 4 -;; whitespace-line-column 78 -;; ;; haskell-process-type 'cabal-repl -;; haskell-process-suggest-remove-import-lines t -;; haskell-process-auto-import-loaded-modules t -;; haskell-process-log t -;; ))) - -;; ;;; ghci-mode -;; (add-hook 'inferior-haskell-mode-hook 'turn-on-ghci-completion) diff -r b5976ed7311a -r 65194c801e61 init.el --- a/init.el Wed Feb 04 11:05:42 2015 -0600 +++ b/init.el Sat Apr 04 20:20:01 2015 -0500 @@ -23,7 +23,7 @@ (delete-selection-mode t) ; replace highlighted text (windmove-default-keybindings) ; move between windows with shift-arrow (fset 'yes-or-no-p 'y-or-n-p) ; replace yes/no prompts -;; (global-hl-line-mode t) ; highlight current line +(global-hl-line-mode t) ; highlight current line ;;; Coding @@ -94,6 +94,7 @@ '(("default" ("Emacs Lisp" (mode . emacs-lisp-mode)) ("Haskell" (mode . haskell-mode)) + ("Cabal" (mode . haskell-cabal-mode)) ("Python" (mode . python-mode)) ("Jython" (mode . jython-mode)) ("Clojure" (mode . clojure-mode)) @@ -113,20 +114,14 @@ ;;; packages (require 'package-require) (package-require '(auto-complete exec-path-from-shell - rainbow-delimiters rainbow-mode solarized-theme visual-regexp - yasnippet zencoding-mode markdown-mode smex move-text)) -;; expand-region multiple-cursors skewer-mode + expand-region rainbow-delimiters rainbow-mode solarized-theme + visual-regexp yasnippet zencoding-mode markdown-mode move-text)) ;;; custom requires (require 'haskell-init) (require 'javascript-init) (require 'c-init) ; c specific elisp -;;; smex -(global-set-key (kbd "M-x") 'smex) -(global-set-key (kbd "M-X") 'smex-major-mode-commands) -(global-set-key (kbd "C-c M-x") 'execute-extended-command) - ;;; auto-complete-mode (require 'auto-complete-config) (ac-config-default) @@ -157,9 +152,6 @@ (setq-default yas-snippet-dirs '("~/.emacs.d/snippets")) (yas-global-mode t) -;;; gradle-mode -(add-to-list 'auto-mode-alist '("\\.gradle$" . groovy-mode)) - ;;; markdown-mode (add-hook 'markdown-mode-hook 'flyspell-mode) @@ -195,7 +187,7 @@ emacs-lisp-mode-hook)) ;;; expand-region -;; (global-set-key (kbd "C-=") 'er/expand-region) +(global-set-key (kbd "C-=") 'er/expand-region) ;;; move-text (global-set-key (kbd "M-p") 'move-text-up)