diff options
| -rw-r--r-- | init.el | 1 | ||||
| -rw-r--r-- | lisp/init-appearance.el | 7 | ||||
| -rw-r--r-- | lisp/init-diminish.el | 15 | ||||
| -rw-r--r-- | lisp/init-elisp.el | 3 | ||||
| -rw-r--r-- | lisp/init-git.el | 2 | ||||
| -rw-r--r-- | lisp/init-gnus.el | 2 | ||||
| -rw-r--r-- | lisp/init-org.el | 5 | ||||
| -rw-r--r-- | lisp/init-projectile.el | 2 | ||||
| -rw-r--r-- | lisp/init-tex.el | 3 | ||||
| -rw-r--r-- | lisp/init-view.el | 3 |
10 files changed, 18 insertions, 25 deletions
@@ -5,6 +5,7 @@ (require 'init-elpa) (require 'init-appearance) (require 'init-general) +(require 'init-diminish) (require-package 'dash) (require 'dash) diff --git a/lisp/init-appearance.el b/lisp/init-appearance.el index 532dc97..9f2553a 100644 --- a/lisp/init-appearance.el +++ b/lisp/init-appearance.el @@ -11,12 +11,5 @@ (column-number-mode t) (size-indication-mode t) -(require-package 'diminish) -(require 'diminish) -(diminish 'abbrev-mode "Ab") -(eval-after-load 'flyspell - '(diminish 'flyspell-mode "Fy")) -;; Other minor modes (paredit, view, yas, ...) are diminished where they -;; are setup. (provide 'init-appearance) diff --git a/lisp/init-diminish.el b/lisp/init-diminish.el new file mode 100644 index 0000000..a2d726d --- /dev/null +++ b/lisp/init-diminish.el @@ -0,0 +1,15 @@ +(require-package 'diminish) +(require 'diminish) + +(diminish 'abbrev-mode "Ab") +(after 'flyspell (diminish 'flyspell-mode "Fy")) +(after 'paredit (diminish 'paredit-mode " Pe")) +(after 'magit (diminish 'magit-auto-revert-mode)) +(after 'mml (diminish 'mml-mode "Ml")) +(after 'org (diminish 'orgstruct-mode "Os")) +(after 'org-table (diminish 'orgtbl-mode "Ot")) +(after 'projectile (diminish 'projectile-mode)) +(after 'reftex (diminish 'reftex-mode "Rf")) +(after 'view (diminish 'view-mode "Vw")) + +(provide 'init-diminish) diff --git a/lisp/init-elisp.el b/lisp/init-elisp.el index bcc6b77..862ca06 100644 --- a/lisp/init-elisp.el +++ b/lisp/init-elisp.el @@ -10,7 +10,6 @@ (define-key paredit-mode-map (kbd "C-,") 'paredit-forward-slurp-sexp) (define-key paredit-mode-map (kbd "C-.") 'paredit-forward-barf-sexp) (define-key paredit-mode-map (kbd "C-M-,") 'paredit-backward-slurp-sexp) - (define-key paredit-mode-map (kbd "C-M-.") 'paredit-backward-barf-sexp) - (diminish 'paredit-mode "Pe")) + (define-key paredit-mode-map (kbd "C-M-.") 'paredit-backward-barf-sexp)) (provide 'init-elisp) diff --git a/lisp/init-git.el b/lisp/init-git.el index bc7c70c..2e1ee30 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -50,8 +50,6 @@ Useful for non-source code repos (e.g., Org mode note files)." (magit-define-popup-action 'magit-branch-popup ?t "Local tracking" 'km/magit-checkout-local-tracking) -(diminish 'magit-auto-revert-mode) - ;; http://whattheemacsd.com/setup-magit.el-01.html (defadvice magit-status (around magit-fullscreen activate) ad-do-it diff --git a/lisp/init-gnus.el b/lisp/init-gnus.el index fe3227b..b56b06a 100644 --- a/lisp/init-gnus.el +++ b/lisp/init-gnus.el @@ -79,8 +79,6 @@ '(lambda () (flyspell-mode 1))) -(diminish 'mml-mode "Ml") - (defun km/follow-last-message-link (arg) "Follow link at bottom of message. When a prefix argument, move to the link but don't follow it." diff --git a/lisp/init-org.el b/lisp/init-org.el index 19e78eb..c76cd66 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -161,11 +161,6 @@ under the current heading." (add-hook 'message-mode-hook 'km/load-orgstruct) (add-hook 'git-commit-mode-hook 'km/load-orgstruct) -(eval-after-load 'org - '(diminish 'orgstruct-mode "Os")) -(eval-after-load 'org-table - '(diminish 'orgtbl-mode "Ot")) - (add-hook 'next-error-hook '(lambda () (when (eq major-mode 'org-mode) (org-show-context)))) diff --git a/lisp/init-projectile.el b/lisp/init-projectile.el index 466aecf..3874ffc 100644 --- a/lisp/init-projectile.el +++ b/lisp/init-projectile.el @@ -52,6 +52,4 @@ I have set `projectile-switch-project-action' to (key-chord-define-global ";r" 'projectile-recentf) (key-chord-define-global ";c" 'projectile-commander) -(diminish 'projectile-mode) - (provide 'init-projectile) diff --git a/lisp/init-tex.el b/lisp/init-tex.el index 8d72162..2929606 100644 --- a/lisp/init-tex.el +++ b/lisp/init-tex.el @@ -75,7 +75,4 @@ The point should be beyond \"\\section\"." (after 'latex (define-key LaTeX-mode-map (kbd "C-c m p") 'km/latex-find-pdf)) -(eval-after-load 'reftex - '(diminish 'reftex-mode "Rf")) - (provide 'init-tex) diff --git a/lisp/init-view.el b/lisp/init-view.el index 424f2df..229d090 100644 --- a/lisp/init-view.el +++ b/lisp/init-view.el @@ -5,7 +5,6 @@ (after 'view (define-key view-mode-map "l" 'recenter-top-bottom) (define-key view-mode-map "a" 'ace-jump-mode) - (define-key view-mode-map "j" 'imenu) - (diminish 'view-mode "Vw")) + (define-key view-mode-map "j" 'imenu)) (provide 'init-view) |