diff options
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 4 | ||||
| -rw-r--r-- | lisp/hexl.el | 5 | ||||
| -rw-r--r-- | lisp/ielm.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cfengine.el | 6 |
6 files changed, 20 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad3c5d71ae..1e11782d11 100644 --- 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 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) diff --git a/lisp/hexl.el b/lisp/hexl.el index e4e16225f1..dc63028b42 100644 --- 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 c53f9e76d4..fdf5fc6e53 100644 --- 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 1ba7a53dfa..7d4f6dc25b 100644 --- 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)))) |