diff options
| author | vincent@spotify.com <vincent@Vincents-MacBook-Pro.local> | 2013-08-27T22·56+0200 |
|---|---|---|
| committer | vincent@spotify.com <vincent@Vincents-MacBook-Pro.local> | 2013-08-27T22·56+0200 |
| commit | a7e4801f3b5c42ad131b4427c75cc021c7ef418a (patch) | |
| tree | 604e1ca8d9d8ac2ed0e96a3eb1801075ae64ca65 | |
| parent | 867a87387c8232c48170c045d13a556a1d68fe3a (diff) | |
Loading mail settings if they exist \nProper up/down history movement in nrepl
| -rw-r--r-- | init-custom.el | 1 | ||||
| -rw-r--r-- | init-modes.el | 11 | ||||
| -rw-r--r-- | init-settings.el | 2 | ||||
| -rw-r--r-- | init.el | 3 |
4 files changed, 15 insertions, 2 deletions
diff --git a/init-custom.el b/init-custom.el index 754689d6683a..347413452fcc 100644 --- a/init-custom.el +++ b/init-custom.el @@ -16,6 +16,7 @@ (quote (capitalized-words-mode turn-on-haskell-decl-scan turn-on-haskell-doc turn-on-hi2))) '(it-mode-google-cmd "/usr/local/bin/google") + '(mu4e-use-fancy-chars t) '(ns-alternate-modifier (quote none)) '(ns-command-modifier (quote meta)) '(require-final-newline (quote visit-save))) diff --git a/init-modes.el b/init-modes.el index d24ee7b0c8f6..1664de11f679 100644 --- a/init-modes.el +++ b/init-modes.el @@ -27,11 +27,18 @@ ;; Use ac-nrepl for completion (add-hook 'nrepl-mode-hook 'ac-nrepl-setup) (add-hook 'nrepl-interaction-mode-hook 'ac-nrepl-setup) -(eval-after-load "auto-complete" - '(add-to-list 'ac-modes 'nrepl-mode)) + +;; I want history up/down without modifiers +(define-key nrepl-mode-map (kbd "<up>") 'nrepl-backward-input) +(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-interaction-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc) +(eval-after-load "auto-complete" + '(add-to-list 'ac-modes 'nrepl-mode)) + ;; Paredit in clojure (add-hook 'clojure-mode-hook 'paredit-mode) diff --git a/init-settings.el b/init-settings.el index 3730497966ee..4256ba1c0f2a 100644 --- a/init-settings.el +++ b/init-settings.el @@ -9,6 +9,8 @@ ;;; Code: +(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e") + (add-to-list 'exec-path "/usr/local/bin") (add-to-list 'exec-path (expand-file-name "~/bin")) (add-to-list 'exec-path "/Applications/Racket/bin") diff --git a/init.el b/init.el index c89a6d0e254c..9281861bb45d 100644 --- a/init.el +++ b/init.el @@ -70,6 +70,9 @@ ;; Actual servers and such are loaded from irc.el (load-file-if-exists "~/.emacs.d/init-irc.el") +;; Mail configuration (mu4e && mbsync) +(load-file-if-exists "~/.emacs.d/init-mail.el") + ;; Load magnars' string manipulation library (require 's) |