From 1e6b51d56c85e9311467baa1ccd6ba7a6ef98293 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 26 Apr 2024 11:23:04 +0200
Subject: emacs: fix eldoc messages being cleared by aphelia when enabled

---
 user/emacs/init.el | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'user')

diff --git a/user/emacs/init.el b/user/emacs/init.el
index 22a9094e..bcb73ed8 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -1104,24 +1104,20 @@ _C-k_: prev  _u_pper              _=_: upper/lower       _s_mart resolve
 
 (use-package format-all
   :defer 10
-  :ghook ('(clojure-mode-hook
-            dockerfile-ts-mode-hook
-            emacs-lisp-mode-hook
-            json-ts-mode-hook
-            markdown-mode-hook
-            sql-mode-hook
-            toml-mode-hook))
+  :ghook ('prog-mode-hook)
   :gfhook #'format-all-ensure-formatter
   :init (progn
           (advice-add 'format-all-ensure-formatter
                       :around #'quiet)
           (defun turn-off-format-all-mode ()
-            (format-all-mode -1)))
+            (when format-all-mode
+              (format-all-mode -1))))
   :config (progn
-            (setq format-all-show-errors 'never)))
+            (setq format-all-show-errors 'errors)))
 
 (use-package apheleia
   :defer 10
+  :ghook 'prog-mode-hook
   :config (progn
             (setf (alist-get 'shfmt apheleia-formatters)
                   '("shfmt"))
-- 
cgit 1.4.1