mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

Emacs: Load magit just-in-time.

master
Pierre Neidhardt 2017-06-25 13:37:15 +01:00
parent 772e96c16f
commit 6ac9bb075f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.emacs.d/init.el
View File

@ -150,11 +150,13 @@
(with-eval-after-load 'lua-mode (require 'init-lua))
;;; Magit
;;; Magit can be loaded just-in-time.
(nconc package-selected-packages '(magit))
(when (require 'magit nil t)
(with-eval-after-load 'magit
(set-face-foreground 'magit-branch-remote "orange red")
(setq git-commit-summary-max-length fill-column)
(setq magit-diff-refine-hunk 'all)
(setq magit-diff-refine-hunk 'all))
(when (fboundp 'magit-status)
(global-set-key (kbd "C-x g") 'magit-status))
;;; Mail with Mutt support.

16
.emacs.d/lisp/init-evil.el
View File

@ -62,11 +62,11 @@ See `eshell' for the numeric prefix arg."
"t" 'org-find-first-agenda
"w" 'evil-window-next
"|" 'swap-windows)
(when (require 'magit nil t)
(when (fboundp 'magit-status)
;; Since it is an autoload, we cannot use `with-eval-after-load'.
;; Use S-SPC instead of SPC to browse commit details.
(evil-leader/set-key "v" 'magit-status))
(when (fboundp 'emms-smart-browse)
;; Since it is an autoload, we cannot use `with-eval-after-load'.
(evil-leader/set-key "M" 'helm-emms)
(evil-leader/set-key "m" 'emms-smart-browse))
(with-eval-after-load 'emms
@ -132,12 +132,12 @@ See `eshell' for the numeric prefix arg."
(evil-set-initial-state 'term-mode 'emacs)
;; Add support for magit.
(require 'evil-magit nil t)
(when (and (require 'magit-mode nil t) (require 'evil-magit nil t))
(evil-magit-define-key evil-magit-state 'magit-mode-map "<" 'magit-section-up)
;; C-j/k is the default, M-j/k is more intuitive if we use it for helm.
(evil-magit-define-key evil-magit-state 'magit-mode-map "M-j" 'magit-section-forward)
(evil-magit-define-key evil-magit-state 'magit-mode-map "M-k" 'magit-section-backward))
(with-eval-after-load 'magit
(when (require 'evil-magit nil t)
(evil-magit-define-key evil-magit-state 'magit-mode-map "<" 'magit-section-up)
;; C-j/k is the default, M-j/k is more intuitive if we use it for helm.
(evil-magit-define-key evil-magit-state 'magit-mode-map "M-j" 'magit-section-forward)
(evil-magit-define-key evil-magit-state 'magit-mode-map "M-k" 'magit-section-backward)))
;; Add support for ediff.
(require 'evil-ediff nil t)