From 3072e7277340f1111bbeeed19f3e834bc05513e7 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Mon, 13 Feb 2017 08:38:37 -0500 Subject: [PATCH] Replace use-package :diminish by spacemacs|hide-lighter --- layers/+lang/emacs-lisp/packages.el | 8 +++++--- layers/+lang/java/packages.el | 2 +- layers/+lang/javascript/packages.el | 4 ++-- layers/+lang/rust/packages.el | 7 ++++--- layers/+spacemacs/spacemacs-layouts/packages.el | 2 +- layers/+tools/rebox/packages.el | 2 +- layers/+vim/evil-cleverparens/packages.el | 4 ++-- layers/+vim/evil-commentary/packages.el | 4 ++-- layers/+vim/evil-snipe/packages.el | 2 +- layers/+vim/vim-empty-lines/packages.el | 2 +- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/layers/+lang/emacs-lisp/packages.el b/layers/+lang/emacs-lisp/packages.el index cef7a3e5c..d599b6265 100644 --- a/layers/+lang/emacs-lisp/packages.el +++ b/layers/+lang/emacs-lisp/packages.el @@ -102,7 +102,6 @@ (defun emacs-lisp/init-auto-compile () (use-package auto-compile :defer t - :diminish (auto-compile-mode . "") :init (progn (setq auto-compile-display-buffer nil @@ -112,6 +111,7 @@ (add-hook 'emacs-lisp-mode-hook 'auto-compile-mode)) :config (progn + (spacemacs|hide-lighter auto-compile-mode) (spacemacs/set-leader-keys-for-major-mode 'emacs-lisp-mode "cl" 'auto-compile-display-log)))) @@ -119,7 +119,6 @@ ;; Elisp go-to-definition with M-. and back again with M-, (use-package elisp-slime-nav :defer t - :diminish elisp-slime-nav-mode :init (progn (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode) @@ -129,7 +128,10 @@ (spacemacs/set-leader-keys-for-major-mode mode "hh" 'elisp-slime-nav-describe-elisp-thing-at-point) (let ((jumpl (intern (format "spacemacs-jump-handlers-%S" mode)))) - (add-to-list jumpl 'elisp-slime-nav-find-elisp-thing-at-point)))))) + (add-to-list jumpl 'elisp-slime-nav-find-elisp-thing-at-point)))) + :config (spacemacs|hide-lighter elisp-slime-nav-mode) + + )) (defun emacs-lisp/init-emacs-lisp () (dolist (mode '(emacs-lisp-mode lisp-interaction-mode)) diff --git a/layers/+lang/java/packages.el b/layers/+lang/java/packages.el index 8d80db346..69e3f2172 100644 --- a/layers/+lang/java/packages.el +++ b/layers/+lang/java/packages.el @@ -30,7 +30,6 @@ (defun java/init-eclim () (use-package eclim :defer t - :diminish eclim-mode :init (progn (add-hook 'java-mode-hook 'eclim-mode) @@ -38,6 +37,7 @@ 'eclim-java-find-declaration)) :config (progn + (spacemacs|hide-lighter eclim-mode) (require 'eclimd) (setq help-at-pt-display-when-idle t help-at-pt-timer-delay 0.1) diff --git a/layers/+lang/javascript/packages.el b/layers/+lang/javascript/packages.el index b829a1560..341d6f821 100644 --- a/layers/+lang/javascript/packages.el +++ b/layers/+lang/javascript/packages.el @@ -160,10 +160,10 @@ (defun javascript/init-tern () (use-package tern :defer t - :diminish tern-mode :init (add-hook 'js2-mode-hook 'tern-mode) :config (progn + (spacemacs|hide-lighter tern-mode) (when javascript-disable-tern-port-files (add-to-list 'tern-command "--no-port-file" 'append)) (spacemacs//set-tern-key-bindings 'js2-mode)))) @@ -185,7 +185,6 @@ (defun javascript/init-skewer-mode () (use-package skewer-mode :defer t - :diminish skewer-mode :init (progn (spacemacs/register-repl 'skewer-mode @@ -194,6 +193,7 @@ (add-hook 'js2-mode-hook 'skewer-mode)) :config (progn + (spacemacs|hide-lighter skewer-mode) (spacemacs/declare-prefix-for-mode 'js2-mode "ms" "skewer") (spacemacs/declare-prefix-for-mode 'js2-mode "me" "eval") (spacemacs/set-leader-keys-for-major-mode 'js2-mode diff --git a/layers/+lang/rust/packages.el b/layers/+lang/rust/packages.el index 8c1c7498a..473a7bc56 100644 --- a/layers/+lang/rust/packages.el +++ b/layers/+lang/rust/packages.el @@ -88,7 +88,6 @@ (exec-path-from-shell-copy-env "RUST_SRC_PATH")) (use-package racer - :diminish racer-mode :defer t :init (progn @@ -99,5 +98,7 @@ (spacemacs/set-leader-keys-for-major-mode 'rust-mode "hh" 'spacemacs/racer-describe)) :config - (evilified-state-evilify-map racer-help-mode-map - :mode racer-help-mode))) + (progn + (spacemacs|hide-lighter racer-mode) + (evilified-state-evilify-map racer-help-mode-map + :mode racer-help-mode)))) diff --git a/layers/+spacemacs/spacemacs-layouts/packages.el b/layers/+spacemacs/spacemacs-layouts/packages.el index 91950e421..678ecde3c 100644 --- a/layers/+spacemacs/spacemacs-layouts/packages.el +++ b/layers/+spacemacs/spacemacs-layouts/packages.el @@ -108,7 +108,6 @@ (defun spacemacs-layouts/init-persp-mode () (use-package persp-mode - :diminish persp-mode :init (progn (setq persp-auto-resume-time (if (or dotspacemacs-auto-resume-layouts @@ -203,6 +202,7 @@ (spacemacs/find-dotfile))) :config (progn + (spacemacs|hide-lighter persp-mode) (defadvice persp-activate (before spacemacs//save-toggle-layout activate) (setq spacemacs--last-selected-layout persp-last-persp-name)) (add-hook 'persp-mode-hook 'spacemacs//layout-autosave) diff --git a/layers/+tools/rebox/packages.el b/layers/+tools/rebox/packages.el index b68dd31c8..172aceae8 100644 --- a/layers/+tools/rebox/packages.el +++ b/layers/+tools/rebox/packages.el @@ -14,7 +14,6 @@ (defun rebox/init-rebox2 () (use-package rebox2 :defer t - :diminish rebox-mode :init (progn (when rebox-enable-in-text-mode @@ -39,6 +38,7 @@ "xbc" 'spacemacs/rebox-transient-state/rebox-center)) :config (progn + (spacemacs|hide-lighter rebox-mode) (rebox-register-template 71 176 ["?" "? box123456" "?"]) diff --git a/layers/+vim/evil-cleverparens/packages.el b/layers/+vim/evil-cleverparens/packages.el index 7ffa3f714..ca8f4bdb4 100644 --- a/layers/+vim/evil-cleverparens/packages.el +++ b/layers/+vim/evil-cleverparens/packages.el @@ -15,10 +15,10 @@ (defun evil-cleverparens/init-evil-cleverparens () (use-package evil-cleverparens :defer t - :diminish evil-cleverparens-mode :init (progn (setq evil-cleverparens-use-regular-insert t) (spacemacs|add-toggle evil-cleverparens :mode evil-cleverparens-mode - :documentation "Enable evil-cleverparens.")))) + :documentation "Enable evil-cleverparens.")) + :config (spacemacs|hide-lighter evil-cleverparens-mode))) diff --git a/layers/+vim/evil-commentary/packages.el b/layers/+vim/evil-commentary/packages.el index 3c164d1f9..11ad304f8 100644 --- a/layers/+vim/evil-commentary/packages.el +++ b/layers/+vim/evil-commentary/packages.el @@ -16,8 +16,8 @@ (defun evil-commentary/init-evil-commentary () (use-package evil-commentary - :diminish evil-commentary-mode :init (progn (evil-commentary-mode) - (spacemacs/set-leader-keys ";" 'evil-commentary)))) + (spacemacs/set-leader-keys ";" 'evil-commentary)) + :config (spacemacs|hide-lighter evil-commentary-mode))) diff --git a/layers/+vim/evil-snipe/packages.el b/layers/+vim/evil-snipe/packages.el index 992684056..bc6d15831 100644 --- a/layers/+vim/evil-snipe/packages.el +++ b/layers/+vim/evil-snipe/packages.el @@ -7,7 +7,6 @@ (defun evil-snipe/init-evil-snipe () (use-package evil-snipe - :diminish evil-snipe-local-mode :init (setq evil-snipe-scope 'whole-buffer evil-snipe-enable-highlight t @@ -17,6 +16,7 @@ evil-snipe-smart-case t) :config (progn + (spacemacs|hide-lighter evil-snipe-local-mode) (if evil-snipe-enable-alternate-f-and-t-behaviors (progn (setq evil-snipe-repeat-scope 'whole-buffer) diff --git a/layers/+vim/vim-empty-lines/packages.el b/layers/+vim/vim-empty-lines/packages.el index 252dc6f9e..9ba94dc96 100644 --- a/layers/+vim/vim-empty-lines/packages.el +++ b/layers/+vim/vim-empty-lines/packages.el @@ -6,7 +6,6 @@ (defun vim-empty-lines/init-vim-empty-lines-mode () (use-package vim-empty-lines-mode - :diminish vim-empty-lines-mode :init (spacemacs/add-to-hooks (lambda () (vim-empty-lines-mode -1)) '(comint-mode-hook @@ -16,6 +15,7 @@ term-mode-hook)) :config (progn + (spacemacs|hide-lighter vim-empty-lines-mode) (global-vim-empty-lines-mode) (spacemacs|add-toggle vim-empty-lines-mode :mode global-vim-empty-lines-mode