Merge branch 'master' of github.com:alanpearce/dotfiles

1 files changed, 12 insertions, 7 deletions

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 10d80c1..fb6eec6 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -200,6 +200,7 @@ By default, Emacs displays page breaks as ^L.  Lines look much nicer.
 #+BEGIN_SRC emacs-lisp
   (use-package page-break-lines
     :defer 5
+    :diminish page-break-lines-mode
     :config (global-page-break-lines-mode))
 #+END_SRC
 ** Modeline
@@ -472,6 +473,7 @@ trash for deleting on OS X.
 
 #+BEGIN_SRC emacs-lisp
   (use-package autorevert
+    :diminish auto-revert-mode
     :init (progn
             (global-auto-revert-mode 1)
             (setq auto-revert-verbose nil
@@ -555,11 +557,12 @@ I don’t like it when editors change an entire file’s layout when I
 open it.  Whitespace butler fixes whitespace only for lines that I’m editing.
 
 #+BEGIN_SRC emacs-lisp
-(use-package ws-butler
-  :if window-system
-  :config (ws-butler-global-mode 1))
-(if (daemonp)
-    (add-hook 'before-make-frame-hook (lambda () (ws-butler-global-mode 1))))
+  (use-package ws-butler
+    :if window-system
+    :diminish ws-butler-mode
+    :config (ws-butler-global-mode 1))
+  (if (daemonp)
+      (add-hook 'before-make-frame-hook (lambda () (ws-butler-global-mode 1))))
 #+END_SRC
 
 ** shrink-whitespace
@@ -1217,6 +1220,7 @@ replace helm and ido.
            ("C-c C-r" . ivy-resume)
            ("C-x i" . ivy-imenu-goto)
            ("C-=" . swiper))
+    :diminish ivy-mode
     :config (progn
               (setq ivy-use-virtual-buffers t
                     ivy-re-builders-alist '((internal-complete-buffer . ivy--regex-fuzzy)
@@ -2161,8 +2165,9 @@ symbol, not word, as I need this for programming the most."
 Sub-word movement is really nice for camel- and Pascal-case
 
 #+BEGIN_SRC emacs-lisp
-(use-package subword
-  :init (global-subword-mode t))
+  (use-package subword
+    :diminish subword-mode
+    :init (global-subword-mode t))
 #+END_SRC
 
 I find that =zap-up-to-char= normally makes more sense to me than