diff options
| author | Vincent Ambo <vincent@spotify.com> | 2013-09-16T11·58+0200 |
|---|---|---|
| committer | Vincent Ambo <vincent@spotify.com> | 2013-09-16T11·58+0200 |
| commit | 924e60005e10aba8ec16622998df642f14997807 (patch) | |
| tree | b99d364e55ae7da4ab045829c8892a1db0ea7c20 | |
| parent | 25d348673bd6951e5e9f9235dbd4db311e1a0567 (diff) | |
Minor fixes for nrepl-mode
| -rw-r--r-- | init-custom.el | 3 | ||||
| -rw-r--r-- | init-modes.el | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/init-custom.el b/init-custom.el index 347413452f..8adbb800fe 100644 --- a/init-custom.el +++ b/init-custom.el @@ -7,10 +7,11 @@ '(ac-delay 0.2) '(custom-safe-themes (quote - ("854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default))) + ("2fb6fbdb644441c4ed1d47f25bed9aa7f7136271c2454ba9a29975d3cfba94c0" "466ae54a7b157ad02fd91da72b7871bccfb9bac98fdab95cf7a0d405c8572bd0" "854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default))) '(erc-modules (quote (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track))) + '(frame-brackground-mode (quote dark)) '(global-auto-complete-mode t) '(haskell-mode-hook (quote diff --git a/init-modes.el b/init-modes.el index 1664de11f6..7a66bb2a6a 100644 --- a/init-modes.el +++ b/init-modes.el @@ -24,8 +24,14 @@ ;; Configure nrepl (Clojure REPL) and clojure-mode +(defun nrepl-mode-setup () + "Activates paredit, rainbow delimiters and ac-nrepl" + (ac-nrepl-setup) + (rainbow-delimiters-mode) + (paredit-mode)) + ;; Use ac-nrepl for completion -(add-hook 'nrepl-mode-hook 'ac-nrepl-setup) +(add-hook 'nrepl-mode-hook 'nrepl-mode-setup) (add-hook 'nrepl-interaction-mode-hook 'ac-nrepl-setup) ;; I want history up/down without modifiers @@ -33,8 +39,11 @@ (define-key nrepl-mode-map (kbd "<down>") 'nrepl-forward-input) (define-key nrepl-mode-map (kbd "C-<up>") 'previous-line) (define-key nrepl-mode-map (kbd "C-<down>") 'next-line) +(define-key nrepl-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc) (define-key nrepl-interaction-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc) +(define-key nrepl-interaction-mode-map (kbd "C-c D") 'nrepl-doc) + (eval-after-load "auto-complete" '(add-to-list 'ac-modes 'nrepl-mode)) |