1 files changed, 14 insertions, 22 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 6cb8e6ce480..a05bd7cc4d4 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -186,8 +186,9 @@ expression point is on."
   :group 'eldoc :lighter eldoc-minor-mode-string
   (setq eldoc-last-message nil)
   (cond
-   ((memq eldoc-documentation-function '(nil ignore))
-    (message "There is no ElDoc support in this buffer")
+   ((not (eldoc--supported-p))
+    (when (called-interactively-p 'any)
+      (message "There is no ElDoc support in this buffer"))
     (setq eldoc-mode nil))
    (eldoc-mode
     (when eldoc-print-after-edit
@@ -203,29 +204,20 @@ expression point is on."
       (setq eldoc-timer nil)))))
 
 ;;;###autoload
-(define-minor-mode global-eldoc-mode
-  "Toggle Global Eldoc mode on or off.
-With a prefix argument ARG, enable Global Eldoc mode if ARG is
-positive, and disable it otherwise.  If called from Lisp, enable
-the mode if ARG is omitted or nil, and toggle it if ARG is ‘toggle’.
-
-If Global Eldoc mode is on, `eldoc-mode' will be enabled in all
-buffers where it's applicable.  These are buffers that have modes
-that have enabled eldoc support.  See `eldoc-documentation-function'."
+(define-globalized-minor-mode global-eldoc-mode eldoc-mode turn-on-eldoc-mode
   :group 'eldoc
-  :global t
   :initialize 'custom-initialize-delay
-  :init-value t
-  (setq eldoc-last-message nil)
-  (if global-eldoc-mode
-      (progn
-	(add-hook 'post-command-hook #'eldoc-schedule-timer)
-	(add-hook 'pre-command-hook #'eldoc-pre-command-refresh-echo-area))
-    (remove-hook 'post-command-hook #'eldoc-schedule-timer)
-    (remove-hook 'pre-command-hook #'eldoc-pre-command-refresh-echo-area)))
+  :init-value t)
 
 ;;;###autoload
-(define-obsolete-function-alias 'turn-on-eldoc-mode 'eldoc-mode "24.4")
+(defun turn-on-eldoc-mode ()
+  "Turn on `eldoc-mode' if the buffer has eldoc support enabled.
+See `eldoc-documentation-function' for more detail."
+  (when (eldoc--supported-p)
+    (eldoc-mode 1)))
+
+(defun eldoc--supported-p ()
+  (not (memq eldoc-documentation-function '(nil ignore))))
 
 
 (defun eldoc-schedule-timer ()
@@ -426,7 +418,7 @@ return any documentation.")
  "down-list" "end-of-" "exchange-point-and-mark" "forward-" "goto-"
  "handle-select-window" "indent-for-tab-command" "left-" "mark-page"
  "mark-paragraph" "mouse-set-point" "move-" "move-beginning-of-"
- "move-end-of-" "next-" "other-window" "pop-global-mark" "previous-"
+ "move-end-of-" "newline" "next-" "other-window" "pop-global-mark" "previous-"
  "recenter" "right-" "scroll-" "self-insert-command" "split-window-"
  "up-list")