eldoc section

1 files changed, 14 insertions, 14 deletions

diff --git a/init.org b/init.org
index 12f12be..c8b1c9a 100644
--- a/init.org
+++ b/init.org
@@ -704,7 +704,6 @@
       (use-package diminish :ensure t)
       (when (require 'use-package-diminish nil 'noerror)
         (eval-after-load "simple" '(diminish 'auto-fill-function " §"))
-        (eval-after-load "eldoc" '(diminish 'eldoc-mode ""))
         (eval-after-load "autorevert" '(diminish 'auto-revert-mode "")))
     #+END_SRC
 * Notifications
@@ -977,6 +976,15 @@
           :bind (:map dired-mode-map (")" . dired-git-info-mode)))
       #+END_SRC
 * General editing
+*** eldoc
+    #+begin_src emacs-lisp
+      (use-package eldoc
+        :init (setq eldoc-mode-line-string nil
+                    global-eldoc-mode nil)
+        :config (global-eldoc-mode -1)
+        :hook ((prog-mode . eldoc-mode))
+        :diminish ((eldoc-mode . "")))
+   #+end_src
 *** Long lines
     [[https://200ok.ch/posts/2020-09-29_comprehensive_guide_on_handling_long_lines_in_emacs.html][Comprehensive guide on handling long lines in Emacs - 200ok]]
     #+begin_src emacs-lisp
@@ -2238,14 +2246,7 @@
 
     Functions to operate on elisp sexps a la slime or geiser:
 
-    #+BEGIN_SRC emacs-lisp
-      (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
-
-      ;; (add-hook 'emacs-lisp-mode-hook
-      ;;           (lambda ()
-      ;;             (when (eq major-mode 'emacs-lisp-mode)
-      ;;               (paredit-mode 1))))
-
+    #+begin_src emacs-lisp
       (defun elisp-disassemble (function)
         (interactive (list (function-called-at-point)))
         (disassemble function))
@@ -2314,11 +2315,11 @@
           (with-temp-buffer
             (byte-compile-file filename t))))
 
-    #+END_SRC
+    #+end_src
 
     Bindinging the functions above to "natural" keys in elisp buffers:
 
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
       (defvar elisp-extra-keys
         '(
           ;;    ((kbd "C-c d")   'elisp-disassemble)
@@ -2336,7 +2337,7 @@
         (let ((key (eval (car binding))) (val (eval (cadr binding))))
           (define-key emacs-lisp-mode-map key val)
           (define-key lisp-interaction-mode-map key val)))
-    #+END_SRC
+    #+end_src
 *** Erlang
     #+begin_src emacs-lisp
       (use-package erlang
@@ -2464,8 +2465,7 @@
                     eldoc-echo-area-use-multiline-p nil
                     nrepl-prompt-to-kill-server-buffer-on-quit nil)
         :hook ((cider-mode . cider-company-enable-fuzzy-completion)
-               (cider-mode . cider-eldoc-setup)
-               (cider-mode . eldoc-mode)))
+               (cider-mode . cider-eldoc-setup)))
 
       (eval-after-load "cider-test"
         '(progn