Replace refs to obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'

* lisp/hexl.el (hexl-mode-hook):
* lisp/ielm.el (ielm-mode-hook):
* lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)
(lisp-interaction-mode-hook):
* lisp/progmodes/cfengine.e (cfengine3-documentation-function):
Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'.

* lisp/emacs-lisp/eldoc.el: Same in commentary.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad3c5d71aedbb530a247f46c73cde12ed0d3b166..1e11782d1102fa17b7e9fe08c2c1bbe46b25fee4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-30  Glenn Morris  <rgm@gnu.org>
+
+       * hexl.el (hexl-mode-hook):
+       * ielm.el (ielm-mode-hook):
+       * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)
+       (lisp-interaction-mode-hook):
+       * progmodes/cfengine.e (cfengine3-documentation-function):
+       Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'.
+
 2014-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 51a4f5491b17407c0a84db8e61d032549eea9e57..28e80d0e2b456e4a9a7b985f63b094895538bf80 100644 (file)
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -36,9 +36,9 @@
 ;; One useful way to enable this minor mode is to put the following in your
 ;; .emacs:
 ;;
-;;      (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
-;;      (add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode)
-;;      (add-hook 'ielm-mode-hook 'turn-on-eldoc-mode)
+;;      (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
+;;      (add-hook 'lisp-interaction-mode-hook 'eldoc-mode)
+;;      (add-hook 'ielm-mode-hook 'eldoc-mode)
 
 ;; Major modes for other languages may use ElDoc by defining an
 ;; appropriate function as the buffer-local value of

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 472ce80440944d0e39b9f6ba5c0e262f220bee76..db15aea7a20cbe268f58c37862776f5af2009a79 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -681,7 +681,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
 
 (defcustom emacs-lisp-mode-hook nil
   "Hook run when entering Emacs Lisp mode."
-  :options '(turn-on-eldoc-mode imenu-add-menubar-index checkdoc-minor-mode)
+  :options '(eldoc-mode imenu-add-menubar-index checkdoc-minor-mode)
   :type 'hook
   :group 'lisp)
 
@@ -693,7 +693,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
 
 (defcustom lisp-interaction-mode-hook nil
   "Hook run when entering Lisp Interaction mode."
-  :options '(turn-on-eldoc-mode)
+  :options '(eldoc-mode)
   :type 'hook
   :group 'lisp)
 

diff --git a/lisp/hexl.el b/lisp/hexl.el
index e4e16225f18bf6e7f278835f948b6c12fc6b97e8..dc63028b42b6dc71155252ddc4c25b1e7ae63e2f 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -1,7 +1,6 @@
 ;;; hexl.el --- edit a file in a hex dump format using the hexl filter -*- lexical-binding: t -*-
 
-;; Copyright (C) 1989, 1994, 1998, 2001-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1989, 1994, 1998, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
 ;; Maintainer: FSF
@@ -91,7 +90,7 @@ as that will override any bit grouping options set here."
 (defcustom hexl-mode-hook '(hexl-follow-line hexl-activate-ruler)
   "Normal hook run when entering Hexl mode."
   :type 'hook
-  :options '(hexl-follow-line hexl-activate-ruler turn-on-eldoc-mode)
+  :options '(hexl-follow-line hexl-activate-ruler eldoc-mode)
   :group 'hexl)
 
 (defface hexl-address-region

diff --git a/lisp/ielm.el b/lisp/ielm.el
index c53f9e76d4e55271b398c51c1335a4fd4792ab06..fdf5fc6e53d8475cb19cf279fecf9b33d2f5fb9c 100644 (file)
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -118,7 +118,7 @@ such as `edebug-defun' to work with such inputs."
 
 (defcustom ielm-mode-hook nil
   "Hooks to be run when IELM (`inferior-emacs-lisp-mode') is started."
-  :options '(turn-on-eldoc-mode)
+  :options '(eldoc-mode)
   :type 'hook
   :group 'ielm)
 (defvaralias 'inferior-emacs-lisp-mode-hook 'ielm-mode-hook)

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 1ba7a53dfa0738bf98086e70000be97896b3bb7c..7d4f6dc25b92f7273496e7b58a34231597178614 100644 (file)
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -47,7 +47,7 @@
 
 ;; It's *highly* recommended that you enable the eldoc minor mode:
 
-;; (add-hook 'cfengine3-mode-hook 'turn-on-eldoc-mode)
+;; (add-hook 'cfengine3-mode-hook 'eldoc-mode)
 
 ;; This is not the same as the mode written by Rolf Ebert
 ;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5.  It does
@@ -1257,8 +1257,8 @@ Calls `cfengine-cf-promises' with \"-s json\""
 
 (defun cfengine3-documentation-function ()
   "Document CFengine 3 functions around point.
-Intended as the value of `eldoc-documentation-function', which
-see.  Use it by executing `turn-on-eldoc-mode'."
+Intended as the value of `eldoc-documentation-function', which see.
+Use it by enabling `eldoc-mode'."
   (let ((fdef (cfengine3--current-function)))
     (when fdef
       (cfengine3-format-function-docstring fdef))))