Merge branch 'master' of home:dotfiles
2 files changed, 8 insertions(+), 4 deletions(-)
M tag-emacs/emacs.d/Cask → tag-emacs/emacs.d/Cask
@@ -58,6 +58,7 @@ (depends-on "php-extras") (depends-on "php-mode") (depends-on "popwin") (depends-on "projectile") +(depends-on "pt") (depends-on "puppet-mode") (depends-on "quickrun") (depends-on "redshank")@@ -77,4 +78,5 @@ (depends-on "undo-tree") (depends-on "use-package") (depends-on "visual-regexp") (depends-on "web-mode") +(depends-on "wgrep-pt") (depends-on "yaml-mode")
M tag-emacs/emacs.d/init.el → tag-emacs/emacs.d/init.el
@@ -609,7 +609,7 @@ (global-semantic-show-unmatched-syntax-mode t) (global-semantic-decoration-mode t))) (req-package flycheck - :diminish (flycheck-mode . " ✓") + :diminish " ✓" :init (global-flycheck-mode)) (req-package company-go@@ -651,7 +651,9 @@ ;;;; Projects (req-package projectile :bind (("C-c C-f" . projectile-find-file) - ("s-x s-f" . projectile-find-file)) + ("s-x s-f" . projectile-find-file) + ("C-x g" . projectile-vc) + ("s-G" . projectile-vc)) :init (projectile-global-mode) :diminish projectile-mode :config (progn@@ -670,8 +672,6 @@ (req-package magit :diminish magit-auto-revert-mode :commands (magit-status) - :bind (("C-x g" . magit-status) - ("s-G" . magit-status)) :init (add-hook 'magit-mode-hook #'magit-load-config-extensions)) ;;;; Spelling@@ -806,6 +806,7 @@ (eldoc-add-command 'paredit-backward-delete 'paredit-close-round 'autopair-insert-opening) (setq eldoc-idle-delay 0.1))) (req-package paredit + :diminish "()" :commands (paredit-mode) :init (progn (add-hook 'lisp-common-mode-hook #'enable-paredit-mode)@@ -877,6 +878,7 @@ run-geiser run-racket)) (req-package redshank + :diminish " Λ" :init (progn (add-hook 'lisp-common-mode-hook #'turn-on-redshank-mode)))