Merge branch 'master' of github.com:alanpearce/dotfiles
2 files changed, 6 insertions(+), 9 deletions(-)
M tag-emacs/emacs.d/Cask ā tag-emacs/emacs.d/Cask
@@ -47,8 +47,6 @@ (depends-on "geiser") (depends-on "ggtags") (depends-on "gh") (depends-on "gist") -(depends-on "git-commit-mode") -(depends-on "git-rebase-mode") (depends-on "git-timemachine") (depends-on "go-eldoc") (depends-on "go-mode")
M tag-emacs/emacs.d/init.el ā tag-emacs/emacs.d/init.el
@@ -647,8 +647,8 @@ " [Not readable]" " [Too big]" " [Confirm]" "\nāÆ " - "" - ))) + "") + ido-vertical-define-keys 'C-n-C-p-up-down-left-right)) :config (ido-vertical-mode 1)) (req-package flx-ido@@ -1034,7 +1034,7 @@ (req-package perspective :bind (("s-p" . persp-switch)) :init (progn - (add-hook 'projectile-switch-project-hook #'persp-mode))) + (persp-mode))) (req-package persp-projectile :require (projectile perspective))@@ -1051,11 +1051,10 @@ (global-diff-hl-mode) (add-hook 'magit-refresh-file-buffer-hook #'diff-hl-update))) (req-package magit - :diminish magit-auto-revert-mode :commands (magit-status) - :config (rename-modeline magit-status-mode (char-to-string (-find #'char-displayable-p '(11942 5848 177))) - (setq magit-last-seen-setup-instructions "1.4.0" - magit-auto-revert-mode t)) + :config (progn (rename-modeline magit-status-mode (char-to-string (-find #'char-displayable-p '(11942 5848 177)))) + (setq magit-last-seen-setup-instructions "1.4.0" + magit-completing-read-function #'magit-ido-completing-read)) :init (add-hook 'magit-mode-hook #'magit-load-config-extensions)) ;;;; Spelling