From 170657ac85332712bd0df78e38f2d254320f3664 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Mon, 24 May 2021 00:07:07 +0100
Subject: problems in clj's tab completion apparently caused by eglot

---
 init.org | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/init.org b/init.org
index 532ec8c..11c08d4 100644
--- a/init.org
+++ b/init.org
@@ -967,10 +967,8 @@
 *** 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))
+        :init (setq eldoc-mode-line-string nil)
+        :config (global-eldoc-mode 1)
         :diminish ((eldoc-mode . "")))
    #+end_src
 *** Long lines
@@ -2292,15 +2290,6 @@
                                       ("s-f f" . flymake-show-diagnostics-buffer)
                                       ("s-f l" . consult-flymake))))
     #+end_src
-*** Eglot
-    #+begin_src emacs-lisp
-      (use-package eglot
-        :ensure t
-        :hook ((erlang-mode . eglot)
-               (elixir-mode . eglot)))
-
-      (jao-define-attached-buffer "\\*eldoc\\( .*\\)?\\*" 0.33)
-    #+end_src
 * Programming languages
 *** Elisp
     Some helper packages
@@ -2504,11 +2493,14 @@
              ("tA" exunit-verify-all "Run all test suites"))))
       #+end_src
 *** Clojure
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
       (use-package clojure-mode
         :ensure t
         :config
-        (add-hook 'clojure-mode-hook (lambda () (setq mode-name "λ"))))
+        (add-hook 'clojure-mode-hook
+                  (lambda ()
+                    (eldoc-mode 1)
+                    (setq mode-name "λ"))))
 
       (use-package cider
         :ensure t
@@ -2530,13 +2522,7 @@
                     cider-use-fringe-indicators nil
                     cider-eldoc-display-for-symbol-at-point t
                     eldoc-echo-area-use-multiline-p nil
-                    nrepl-prompt-to-kill-server-buffer-on-quit nil)
-
-        (defun jao-cider--tabs-workaround () (setq-local tab-always-indent t))
-
-        :hook ((cider-mode . cider-company-enable-fuzzy-completion)
-               (cider-mode . cider-eldoc-setup)
-               (cider-mode . jao-cider--tabs-workaround)))
+                    nrepl-prompt-to-kill-server-buffer-on-quit nil))
 
       (with-eval-after-load "cider-test"
         (advice-add 'cider-scale-background-color :override
@@ -2546,9 +2532,9 @@
 
       (use-package cider-macroexpansion
         :after cider
-        :diminish ((cider-macroexpansion-mode . " µ")))
+        :diminish " µ")
 
-    #+END_SRC
+    #+end_src
 *** Geiser
     #+begin_src emacs-lisp
       (defun jao-org--set-geiser-impl () (setq-local geiser-repl--impl 'guile))
-- 
cgit v1.2.3