replace use of diminish library

2 files changed, 2 insertions, 10 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index cb3386d9..1e720adc 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -75,7 +75,6 @@
 
 (require 'cl-lib)
 (require 'subr-x)
-(require 'diminish)
 (require 'paredit)
 (require 'ws-butler)
 (require 'mode-local)
@@ -222,6 +221,7 @@ windows side-by-side in the frame."
  '(dired-recursive-copies 'always)
  '(display-fill-column-indicator-character 32)
  '(ediff-split-window-function 'split-window-horizontally)
+ '(eldoc-minor-mode-string nil)
  '(emacs-lisp-docstring-fill-column 75)
  '(enable-recursive-minibuffers t)
  '(eshell-cmpl-cycle-completions nil nil nil "This makes Eshell completions a bit more like bash's.")
@@ -1011,7 +1011,6 @@ To be used only when it seems to be necessary."
 ;; the version of the file we had in Emacs, we can just hit undo
 (setq auto-revert-use-notify nil)
 (global-auto-revert-mode 1)
-(diminish 'auto-revert-mode)
 
 ;; Work around lack of <https://github.com/magit/magit/pull/4591>.
 (setq magit-auto-revert-mode nil)
@@ -1074,7 +1073,7 @@ To be used only when it seems to be necessary."
   (setq save-abbrevs 'silently)
 
   (setq-default abbrev-mode t)
-  (diminish 'abbrev-mode))
+  (setf (cadr (assq 'abbrev-mode minor-mode-alist)) nil))
 
 ;; similar
 (defvar spw/doc-bookmarks-file (expand-file-name "~/doc/emacs-bookmarks"))
@@ -1115,8 +1114,6 @@ To be used only when it seems to be necessary."
 (define-key isearch-mode-map "\C-w" nil)
 (define-key isearch-mode-map "\C-z\C-w" #'spw/isearch-yank-word-or-char)
 
-(diminish 'eldoc-mode)
-
 ;; Invert meaning of C-u for M-= except when the region is active.
 (defun spw/count-words ()
   (interactive)
@@ -4284,8 +4281,6 @@ unread."
 
 ;;;; Assorted packages
 
-(diminish 'ws-butler-mode)
-
 ;; message-mode is sensitive to trailing whitespace in sig dashes and empty
 ;; headers.  markdown-mode is sensitive in empty headers (e.g. "# " which I
 ;; use in writing essays) and newlines that indicate paragraph flow (obscure
@@ -4580,8 +4575,6 @@ likely to keep parentheses balanced."
   (nil eval-expression-minibuffer-setup-hook)
   scheme (xscheme xscheme-start-hook) slime-repl)
 
-(diminish 'paredit-mode)
-
 (defun spw/paredit-unix-word-rubout (arg)
   (interactive "p")
   (cond ((save-excursion
@@ -4764,7 +4757,6 @@ likely to keep parentheses balanced."
 ;;;; Text mode
 
 (add-hook 'text-mode-hook #'turn-on-auto-fill)
-(diminish 'auto-fill-function)
 
 ;; for writing notes on ftp-master.debian.org
 (add-to-list 'auto-mode-alist '("dak[A-Za-z0-9_]+\\'" . text-mode))
diff --git a/.emacs.d/initlibs/diminish.el b/archive/.emacs.d/initlibs/diminish.el
index b7ddc099..b7ddc099 100644
--- a/.emacs.d/initlibs/diminish.el
+++ b/archive/.emacs.d/initlibs/diminish.el