From 135ebd925f52c27fa15ae4eceac3dc7562cb558c Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 23 Apr 2018 00:34:03 -0400
Subject: [PATCH] Enable global-eldoc-mode; less work for me!

---
 core/core-ui.el                   | 2 --
 modules/lang/csharp/config.el     | 2 +-
 modules/lang/emacs-lisp/config.el | 2 +-
 modules/lang/haskell/+intero.el   | 2 +-
 modules/lang/java/+meghanada.el   | 2 +-
 modules/lang/javascript/config.el | 2 --
 modules/lang/rust/config.el       | 2 +-
 modules/lang/scala/config.el      | 2 --
 8 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/core/core-ui.el b/core/core-ui.el
index 89568bd20..09946bb0c 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -525,8 +525,6 @@ frame's window-system, the theme will be reloaded.")
 ;; Bootstrap
 ;;
 
-;; auto-enabled in Emacs 25+; I'll do it myself
-(global-eldoc-mode -1)
 ;; simple name in frame title
 (setq frame-title-format '("%b – Doom Emacs"))
 ;; make `next-buffer', `other-buffer', etc. ignore unreal buffers
diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el
index 41b2ded8b..fc8debc9e 100644
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@@ -15,7 +15,7 @@
     (unless (file-exists-p omnisharp-bin)
       (warn! "Omnisharp server isn't installed, completion won't work")))
 
-  (add-hook! csharp-mode #'(eldoc-mode flycheck-mode omnisharp-mode))
+  (add-hook! csharp-mode #'(flycheck-mode omnisharp-mode))
 
   (defun +csharp|cleanup-omnisharp-server ()
     "Clean up the omnisharp server once you kill the last csharp-mode buffer."
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index b5ef8c51c..ee61d1eb9 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -19,7 +19,7 @@
 
   (add-hook! 'emacs-lisp-mode-hook
     #'(;; 3rd-party functionality
-       eldoc-mode auto-compile-on-save-mode doom|enable-delete-trailing-whitespace
+       auto-compile-on-save-mode doom|enable-delete-trailing-whitespace
        ;; fontification
        rainbow-delimiters-mode highlight-quoted-mode highlight-numbers-mode +emacs-lisp|extra-fontification
        ;; initialization
diff --git a/modules/lang/haskell/+intero.el b/modules/lang/haskell/+intero.el
index 8de53afd9..372e3e51b 100644
--- a/modules/lang/haskell/+intero.el
+++ b/modules/lang/haskell/+intero.el
@@ -5,7 +5,7 @@
   :after haskell-mode
   :config
   (add-hook 'haskell-mode-hook #'+haskell|init-intero)
-  (add-hook! 'intero-mode-hook #'(flycheck-mode eldoc-mode))
+  (add-hook 'intero-mode-hook #'flycheck-mode)
   (set! :lookup 'haskell-mode :definition #'intero-goto-definition))
 
 
diff --git a/modules/lang/java/+meghanada.el b/modules/lang/java/+meghanada.el
index 8ef176d51..4a0ee7767 100644
--- a/modules/lang/java/+meghanada.el
+++ b/modules/lang/java/+meghanada.el
@@ -14,7 +14,7 @@
     :definition #'meghanada-jump-declaration
     :references #'meghanada-reference)
 
-  (add-hook! 'meghanada-mode-hook #'(flycheck-mode eldoc-mode))
+  (add-hook 'meghanada-mode-hook #'flycheck-mode)
 
   ;;
   (def-menu! +java/refactor-menu
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 931038138..50b515437 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -80,8 +80,6 @@
       (tide-setup)))
   (add-hook 'web-mode-hook #'+javascript|init-tide-in-web-mode)
   :config
-  (add-hook 'tide-mode-hook #'eldoc-mode)
-
   ;; code completion
   (after! company
     ;; tide affects the global `company-backends', undo this so doom can handle
diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el
index 01dbd9f29..9a45ae71e 100644
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@@ -25,7 +25,7 @@
 (def-package! racer
   :after rust-mode
   :config
-  (add-hook! 'rust-mode-hook #'(eldoc-mode racer-mode))
+  (add-hook 'rust-mode-hook #'racer-mode)
   (set! :lookup 'rust-mode
     :definition #'racer-find-definition
     :documentation #'racer-describe))
diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el
index b656ebbf6..510f903e0 100644
--- a/modules/lang/scala/config.el
+++ b/modules/lang/scala/config.el
@@ -12,8 +12,6 @@
   :commands (ensime ensime-scala-mode-hook)
   :hook (scala-mode . ensime-mode)
   :config
-  (add-hook 'ensime-mode-hook #'eldoc-mode)
-
   (set! :company-backend 'scala-mode '(ensime-company company-yasnippet))
 
   (setq ensime-startup-snapshot-notification nil