diff options
| -rw-r--r-- | init.el | 1 | ||||
| -rw-r--r-- | init/custom.el | 3 | ||||
| -rw-r--r-- | init/haskell-setup.el | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/init.el b/init.el index 9358bb6c0107..db788c4d224e 100644 --- a/init.el +++ b/init.el @@ -94,3 +94,4 @@ ;; SML should respect theme colours ;; (setq sml/theme 'powerline) (sml/setup) +(put 'upcase-region 'disabled nil) diff --git a/init/custom.el b/init/custom.el index ba1ac791b71c..03183f7d5a70 100644 --- a/init/custom.el +++ b/init/custom.el @@ -16,6 +16,9 @@ '(ns-alternate-modifier (quote none)) '(ns-command-modifier (quote control)) '(ns-right-command-modifier (quote meta)) + '(package-selected-packages + (quote + (fish-mode string-inflection groovy-mode swift-mode toml-mode nginx-mode elixir-mode terraform-mode uuidgen uuid yaml-mode undo-tree switch-window smex smart-mode-line rust-mode rainbow-mode rainbow-delimiters puppet-mode projectile pkgbuild-mode password-store paredit multi-term multiple-cursors markdown-mode+ magit iy-go-to-char ido-ubiquitous idle-highlight-mode hi2 haskell-mode go-mode flycheck flx-ido erlang dockerfile-mode confluence cider browse-kill-ring ag ace-jump-mode))) '(require-final-newline (quote visit-save)) '(sml/theme (quote dark))) (custom-set-faces diff --git a/init/haskell-setup.el b/init/haskell-setup.el index bd61013c25b8..c2ed22b25248 100644 --- a/init/haskell-setup.el +++ b/init/haskell-setup.el @@ -11,8 +11,7 @@ (interactive) (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload) (define-key haskell-mode-map (kbd "C-c C-c") 'haskell-compile) - (define-key haskell-mode-map (kbd "C-r") 'haskell-interactive-bring) - (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space)) + (define-key haskell-mode-map (kbd "C-r") 'haskell-interactive-bring)) (eval-after-load "haskell-mode" '(haskell-mode-binding-setup)) |