summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2014-06-13 14:15:32 +0100
committerAlan Pearce2014-06-13 14:15:32 +0100
commitf6fe893a827377c6c314db8f0745ea42b2c267e3 (patch)
tree53e6ffe004795dc558a278863d4be78d033ff2ba
parent50cb6462e21486acae48109fb0cb6bf87573f060 (diff)
parent89e7a9363975172443cfdcd87cc525076d11d64c (diff)
downloaddotfiles-f6fe893a827377c6c314db8f0745ea42b2c267e3.tar.lz
dotfiles-f6fe893a827377c6c314db8f0745ea42b2c267e3.tar.zst
dotfiles-f6fe893a827377c6c314db8f0745ea42b2c267e3.zip
Merge branch 'master' of home:dotfiles
-rw-r--r--tag-emacs/emacs.d/Cask2
-rw-r--r--tag-emacs/emacs.d/init.el10
2 files changed, 8 insertions, 4 deletions
diff --git a/tag-emacs/emacs.d/Cask b/tag-emacs/emacs.d/Cask
index ba2d1aa..107e024 100644
--- a/tag-emacs/emacs.d/Cask
+++ b/tag-emacs/emacs.d/Cask
@@ -58,6 +58,7 @@
 (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 "use-package")
 (depends-on "visual-regexp")
 (depends-on "web-mode")
+(depends-on "wgrep-pt")
 (depends-on "yaml-mode")
\ No newline at end of file
diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index aa2acb5..f7b8d47 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -609,7 +609,7 @@
             (global-semantic-decoration-mode t)))
 
 (req-package flycheck
-  :diminish (flycheck-mode . " ✓")
+  :diminish " ✓"
   :init (global-flycheck-mode))
 
 (req-package company-go
@@ -651,7 +651,9 @@
 
 (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 @@
             (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-racket))
 
 (req-package redshank
+  :diminish " Λ"
   :init (progn
           (add-hook 'lisp-common-mode-hook #'turn-on-redshank-mode)))