Commit ad78f432 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 566cb04b
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> 2014-01-30 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic' * emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
;; One useful way to enable this minor mode is to put the following in your ;; One useful way to enable this minor mode is to put the following in your
;; .emacs: ;; .emacs:
;; ;;
;; (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode) ;; (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
;; (add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode) ;; (add-hook 'lisp-interaction-mode-hook 'eldoc-mode)
;; (add-hook 'ielm-mode-hook 'turn-on-eldoc-mode) ;; (add-hook 'ielm-mode-hook 'eldoc-mode)
;; Major modes for other languages may use ElDoc by defining an ;; Major modes for other languages may use ElDoc by defining an
;; appropriate function as the buffer-local value of ;; appropriate function as the buffer-local value of
......
...@@ -681,7 +681,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.") ...@@ -681,7 +681,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
(defcustom emacs-lisp-mode-hook nil (defcustom emacs-lisp-mode-hook nil
"Hook run when entering Emacs Lisp mode." "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 :type 'hook
:group 'lisp) :group 'lisp)
...@@ -693,7 +693,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.") ...@@ -693,7 +693,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
(defcustom lisp-interaction-mode-hook nil (defcustom lisp-interaction-mode-hook nil
"Hook run when entering Lisp Interaction mode." "Hook run when entering Lisp Interaction mode."
:options '(turn-on-eldoc-mode) :options '(eldoc-mode)
:type 'hook :type 'hook
:group 'lisp) :group 'lisp)
......
;;; hexl.el --- edit a file in a hex dump format using the hexl filter -*- lexical-binding: t -*- ;;; 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, ;; Copyright (C) 1989, 1994, 1998, 2001-2014 Free Software Foundation, Inc.
;; Inc.
;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu> ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
;; Maintainer: FSF ;; Maintainer: FSF
...@@ -91,7 +90,7 @@ as that will override any bit grouping options set here." ...@@ -91,7 +90,7 @@ as that will override any bit grouping options set here."
(defcustom hexl-mode-hook '(hexl-follow-line hexl-activate-ruler) (defcustom hexl-mode-hook '(hexl-follow-line hexl-activate-ruler)
"Normal hook run when entering Hexl mode." "Normal hook run when entering Hexl mode."
:type 'hook :type 'hook
:options '(hexl-follow-line hexl-activate-ruler turn-on-eldoc-mode) :options '(hexl-follow-line hexl-activate-ruler eldoc-mode)
:group 'hexl) :group 'hexl)
(defface hexl-address-region (defface hexl-address-region
......
...@@ -118,7 +118,7 @@ such as `edebug-defun' to work with such inputs." ...@@ -118,7 +118,7 @@ such as `edebug-defun' to work with such inputs."
(defcustom ielm-mode-hook nil (defcustom ielm-mode-hook nil
"Hooks to be run when IELM (`inferior-emacs-lisp-mode') is started." "Hooks to be run when IELM (`inferior-emacs-lisp-mode') is started."
:options '(turn-on-eldoc-mode) :options '(eldoc-mode)
:type 'hook :type 'hook
:group 'ielm) :group 'ielm)
(defvaralias 'inferior-emacs-lisp-mode-hook 'ielm-mode-hook) (defvaralias 'inferior-emacs-lisp-mode-hook 'ielm-mode-hook)
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
;; It's *highly* recommended that you enable the eldoc minor mode: ;; 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 ;; This is not the same as the mode written by Rolf Ebert
;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5. It does ;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5. It does
...@@ -1257,8 +1257,8 @@ Calls `cfengine-cf-promises' with \"-s json\"" ...@@ -1257,8 +1257,8 @@ Calls `cfengine-cf-promises' with \"-s json\""
(defun cfengine3-documentation-function () (defun cfengine3-documentation-function ()
"Document CFengine 3 functions around point. "Document CFengine 3 functions around point.
Intended as the value of `eldoc-documentation-function', which Intended as the value of `eldoc-documentation-function', which see.
see. Use it by executing `turn-on-eldoc-mode'." Use it by enabling `eldoc-mode'."
(let ((fdef (cfengine3--current-function))) (let ((fdef (cfengine3--current-function)))
(when fdef (when fdef
(cfengine3-format-function-docstring fdef)))) (cfengine3-format-function-docstring fdef))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment