diff options
| author | Alan Pearce | 2015-07-03 22:00:04 +0200 |
|---|---|---|
| committer | Alan Pearce | 2015-07-03 22:00:04 +0200 |
| commit | bd174ff0b3ef16f4a89e49f5279166df0e372457 (patch) | |
| tree | cb6552a87a8e91b2af589c91d1ae5b5db3cfe1fb | |
| parent | 39bdfb8c26403446137c2dfcad0d78f06d4f388a (diff) | |
| parent | 90fac9da73f254af75379ee3e56a01bce49a83a5 (diff) | |
| download | dotfiles-bd174ff0b3ef16f4a89e49f5279166df0e372457.tar.lz dotfiles-bd174ff0b3ef16f4a89e49f5279166df0e372457.tar.zst dotfiles-bd174ff0b3ef16f4a89e49f5279166df0e372457.zip | |
Merge branch 'master' of github.com:alanpearce/dotfiles
| -rw-r--r-- | tag-emacs/emacs.d/Cask | 2 | ||||
| -rw-r--r-- | tag-emacs/emacs.d/init.el | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/tag-emacs/emacs.d/Cask b/tag-emacs/emacs.d/Cask index 65f05b9..57de007 100644 --- a/tag-emacs/emacs.d/Cask +++ b/tag-emacs/emacs.d/Cask @@ -47,8 +47,6 @@ (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") diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el index d5fd6af..b8835d9 100644 --- a/tag-emacs/emacs.d/init.el +++ b/tag-emacs/emacs.d/init.el @@ -647,8 +647,8 @@ " [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 @@ mouse-1: Display Line and Column Mode Menu")))))) (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 @@ mouse-1: Display Line and Column Mode Menu")))))) (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 |