summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-01-29 23:42:57 -0800
committerGlenn Morris <rgm@gnu.org>2014-01-29 23:42:57 -0800
commitad78f432005af4100fb6be5bb015393f77e1fdfe (patch)
tree130b82cbd60a1bdb1da49a13b019424bb5fb3478 /lisp/emacs-lisp
parent566cb04bdfcf5177c9069120e628d5067086783f (diff)
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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/eldoc.el6
-rw-r--r--lisp/emacs-lisp/lisp-mode.el4
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 51a4f5491b..28e80d0e2b 100644
--- 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 472ce80440..db15aea7a2 100644
--- 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)