2014-09-04 15:23:37 +00:00
|
|
|
|
;;; eldoc.el --- Show function arglist or variable docstring in echo area -*- lexical-binding:t; -*-
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2020-01-01 00:19:43 +00:00
|
|
|
|
;; Copyright (C) 1996-2020 Free Software Foundation, Inc.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
1998-09-19 02:15:26 +00:00
|
|
|
|
;; Author: Noah Friedman <friedman@splode.com>
|
1995-11-12 21:04:08 +00:00
|
|
|
|
;; Keywords: extensions
|
|
|
|
|
;; Created: 1995-10-06
|
2020-05-13 10:31:21 +00:00
|
|
|
|
;; Version: 1.0.0
|
|
|
|
|
;; Package-Requires: ((emacs "26.3"))
|
|
|
|
|
|
|
|
|
|
;; This is a GNU ELPA :core package. Avoid functionality that is not
|
|
|
|
|
;; compatible with the version of Emacs recorded above.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
1997-02-03 06:13:34 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1995-11-12 21:04:08 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1997-02-03 06:13:34 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1995-11-12 21:04:08 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
1997-02-03 06:13:34 +00:00
|
|
|
|
|
1995-11-12 21:04:08 +00:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
1997-02-03 06:13:34 +00:00
|
|
|
|
;; This program was inspired by the behavior of the "mouse documentation
|
|
|
|
|
;; window" on many Lisp Machine systems; as you type a function's symbol
|
|
|
|
|
;; name as part of a sexp, it will print the argument list for that
|
|
|
|
|
;; function. Behavior is not identical; for example, you need not actually
|
|
|
|
|
;; type the function name, you need only move point around in a sexp that
|
|
|
|
|
;; calls it. Also, if point is over a documented variable, it will print
|
|
|
|
|
;; the one-line documentation for that variable instead, to remind you of
|
|
|
|
|
;; that variable's meaning.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2020-03-12 22:21:19 +00:00
|
|
|
|
;; This mode is now enabled by default in all major modes that provide
|
|
|
|
|
;; support for it, such as `emacs-lisp-mode'.
|
|
|
|
|
;; This is controlled by `global-eldoc-mode'.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2020-02-25 22:53:04 +00:00
|
|
|
|
;; Major modes for other languages may use ElDoc by adding an
|
|
|
|
|
;; appropriate function to the buffer-local value of
|
|
|
|
|
;; `eldoc-documentation-functions'.
|
2003-09-06 17:32:31 +00:00
|
|
|
|
|
1995-11-12 21:04:08 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
1997-04-14 07:33:28 +00:00
|
|
|
|
(defgroup eldoc nil
|
|
|
|
|
"Show function arglist or variable docstring in echo area."
|
2000-07-24 00:38:34 +00:00
|
|
|
|
:group 'lisp
|
1997-04-14 07:33:28 +00:00
|
|
|
|
:group 'extensions)
|
|
|
|
|
|
|
|
|
|
(defcustom eldoc-idle-delay 0.50
|
2009-01-16 03:24:54 +00:00
|
|
|
|
"Number of seconds of idle time to wait before printing.
|
1995-11-12 21:04:08 +00:00
|
|
|
|
If user input arrives before this interval of time has elapsed after the
|
|
|
|
|
last input, no documentation will be printed.
|
|
|
|
|
|
1997-04-14 07:33:28 +00:00
|
|
|
|
If this variable is set to 0, no idle time is required."
|
2020-03-12 22:21:19 +00:00
|
|
|
|
:type 'number)
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2014-01-12 04:00:03 +00:00
|
|
|
|
(defcustom eldoc-print-after-edit nil
|
|
|
|
|
"If non-nil eldoc info is only shown when editing.
|
|
|
|
|
Changing the value requires toggling `eldoc-mode'."
|
2020-03-12 22:21:19 +00:00
|
|
|
|
:type 'boolean)
|
2014-01-12 04:00:03 +00:00
|
|
|
|
|
2000-07-24 00:38:34 +00:00
|
|
|
|
;;;###autoload
|
2009-11-11 19:24:20 +00:00
|
|
|
|
(defcustom eldoc-minor-mode-string (purecopy " ElDoc")
|
2009-01-17 20:01:17 +00:00
|
|
|
|
"String to display in mode line when ElDoc Mode is enabled; nil for none."
|
2020-03-12 22:21:19 +00:00
|
|
|
|
:type '(choice string (const :tag "None" nil)))
|
1997-02-03 06:13:34 +00:00
|
|
|
|
|
2014-08-18 19:28:40 +00:00
|
|
|
|
(defcustom eldoc-argument-case #'identity
|
1995-11-12 21:04:08 +00:00
|
|
|
|
"Case to display argument names of functions, as a symbol.
|
|
|
|
|
This has two preferred values: `upcase' or `downcase'.
|
|
|
|
|
Actually, any name of a function which takes a string as an argument and
|
2009-01-16 03:24:54 +00:00
|
|
|
|
returns another string is acceptable.
|
|
|
|
|
|
2014-12-11 02:56:33 +00:00
|
|
|
|
Note that this variable has no effect, unless
|
|
|
|
|
`eldoc-documentation-function' handles it explicitly."
|
2000-07-24 00:38:34 +00:00
|
|
|
|
:type '(radio (function-item upcase)
|
|
|
|
|
(function-item downcase)
|
2020-03-12 22:21:19 +00:00
|
|
|
|
function))
|
2014-09-29 18:14:08 +00:00
|
|
|
|
(make-obsolete-variable 'eldoc-argument-case nil "25.1")
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2000-07-24 00:38:34 +00:00
|
|
|
|
(defcustom eldoc-echo-area-use-multiline-p 'truncate-sym-name-if-fit
|
2009-01-16 03:24:54 +00:00
|
|
|
|
"Allow long ElDoc messages to resize echo area display.
|
2003-05-06 17:36:16 +00:00
|
|
|
|
If value is t, never attempt to truncate messages; complete symbol name
|
2000-07-24 00:38:34 +00:00
|
|
|
|
and function arglist or 1-line variable documentation will be displayed
|
|
|
|
|
even if echo area must be resized to fit.
|
|
|
|
|
|
2003-05-06 17:36:16 +00:00
|
|
|
|
If value is any non-nil value other than t, symbol name may be truncated
|
2000-07-24 00:38:34 +00:00
|
|
|
|
if it will enable the function arglist or documentation string to fit on a
|
|
|
|
|
single line without resizing window. Otherwise, behavior is just like
|
|
|
|
|
former case.
|
|
|
|
|
|
|
|
|
|
If value is nil, messages are always truncated to fit in a single line of
|
|
|
|
|
display in the echo area. Function or variable symbol name may be
|
2009-01-16 03:24:54 +00:00
|
|
|
|
truncated to make more of the arglist or documentation string visible.
|
|
|
|
|
|
2014-12-11 02:56:33 +00:00
|
|
|
|
Note that this variable has no effect, unless
|
|
|
|
|
`eldoc-documentation-function' handles it explicitly."
|
2000-07-24 00:38:34 +00:00
|
|
|
|
:type '(radio (const :tag "Always" t)
|
|
|
|
|
(const :tag "Never" nil)
|
|
|
|
|
(const :tag "Yes, but truncate symbol names if it will\
|
2020-03-12 22:21:19 +00:00
|
|
|
|
enable argument list to fit on one line" truncate-sym-name-if-fit)))
|
2000-07-24 00:38:34 +00:00
|
|
|
|
|
2007-08-24 02:30:59 +00:00
|
|
|
|
(defface eldoc-highlight-function-argument
|
|
|
|
|
'((t (:inherit bold)))
|
2009-01-16 03:24:54 +00:00
|
|
|
|
"Face used for the argument at point in a function's argument list.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
Note that this face has no effect unless the `eldoc-documentation-function'
|
2020-03-12 22:21:19 +00:00
|
|
|
|
handles it explicitly.")
|
2007-08-24 02:30:59 +00:00
|
|
|
|
|
2000-07-24 00:38:34 +00:00
|
|
|
|
;;; No user options below here.
|
|
|
|
|
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(defvar eldoc-message-commands-table-size 31
|
2009-01-16 03:24:54 +00:00
|
|
|
|
"Used by `eldoc-add-command' to initialize `eldoc-message-commands' obarray.
|
2005-10-04 21:49:09 +00:00
|
|
|
|
It should probably never be necessary to do so, but if you
|
|
|
|
|
choose to increase the number of buckets, you must do so before loading
|
|
|
|
|
this file since the obarray is initialized at load time.
|
|
|
|
|
Remember to keep it a prime number to improve hash performance.")
|
|
|
|
|
|
2014-10-15 17:32:41 +00:00
|
|
|
|
(defvar eldoc-message-commands
|
|
|
|
|
;; Don't define as `defconst' since it would then go to (read-only) purespace.
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(make-vector eldoc-message-commands-table-size 0)
|
|
|
|
|
"Commands after which it is appropriate to print in the echo area.
|
2009-01-17 20:01:17 +00:00
|
|
|
|
ElDoc does not try to print function arglists, etc., after just any command,
|
2005-10-04 21:49:09 +00:00
|
|
|
|
because some commands print their own messages in the echo area and these
|
2007-09-26 11:55:46 +00:00
|
|
|
|
functions would instantly overwrite them. But `self-insert-command' as well
|
2005-10-04 21:49:09 +00:00
|
|
|
|
as most motion commands are good candidates.
|
|
|
|
|
This variable contains an obarray of symbols; do not manipulate it
|
|
|
|
|
directly. Instead, use `eldoc-add-command' and `eldoc-remove-command'.")
|
|
|
|
|
|
2009-01-17 20:01:17 +00:00
|
|
|
|
;; Not a constant.
|
2014-10-15 17:32:41 +00:00
|
|
|
|
(defvar eldoc-last-data (make-vector 3 nil)
|
|
|
|
|
;; Don't define as `defconst' since it would then go to (read-only) purespace.
|
2005-10-04 21:49:09 +00:00
|
|
|
|
"Bookkeeping; elements are as follows:
|
|
|
|
|
0 - contains the last symbol read from the buffer.
|
2007-07-12 01:51:52 +00:00
|
|
|
|
1 - contains the string last displayed in the echo area for variables,
|
|
|
|
|
or argument string for functions.
|
2014-10-15 17:32:41 +00:00
|
|
|
|
2 - `function' if function args, `variable' if variable documentation.")
|
|
|
|
|
(make-obsolete-variable 'eldoc-last-data "use your own instead" "25.1")
|
2009-01-17 20:01:17 +00:00
|
|
|
|
|
1997-02-19 10:24:26 +00:00
|
|
|
|
(defvar eldoc-last-message nil)
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2009-01-16 03:24:54 +00:00
|
|
|
|
(defvar eldoc-timer nil "ElDoc's timer object.")
|
1997-02-03 06:13:34 +00:00
|
|
|
|
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(defvar eldoc-current-idle-delay eldoc-idle-delay
|
2007-09-26 11:55:46 +00:00
|
|
|
|
"Idle time delay currently in use by timer.
|
2005-10-04 21:49:09 +00:00
|
|
|
|
This is used to determine if `eldoc-idle-delay' is changed by the user.")
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2014-01-21 13:09:55 +00:00
|
|
|
|
(defvar eldoc-message-function #'eldoc-minibuffer-message
|
2013-03-17 15:00:37 +00:00
|
|
|
|
"The function used by `eldoc-message' to display messages.
|
|
|
|
|
It should receive the same arguments as `message'.")
|
|
|
|
|
|
2014-01-12 04:00:03 +00:00
|
|
|
|
(defun eldoc-edit-message-commands ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Return an obarray containing common editing commands.
|
|
|
|
|
|
|
|
|
|
When `eldoc-print-after-edit' is non-nil, ElDoc messages are only
|
|
|
|
|
printed after commands contained in this obarray."
|
2014-01-12 04:00:03 +00:00
|
|
|
|
(let ((cmds (make-vector 31 0))
|
|
|
|
|
(re (regexp-opt '("delete" "insert" "edit" "electric" "newline"))))
|
|
|
|
|
(mapatoms (lambda (s)
|
|
|
|
|
(and (commandp s)
|
|
|
|
|
(string-match-p re (symbol-name s))
|
|
|
|
|
(intern (symbol-name s) cmds)))
|
|
|
|
|
obarray)
|
|
|
|
|
cmds))
|
|
|
|
|
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2001-11-16 23:58:48 +00:00
|
|
|
|
(define-minor-mode eldoc-mode
|
2011-10-20 00:26:14 +00:00
|
|
|
|
"Toggle echo area display of Lisp objects at point (ElDoc mode).
|
|
|
|
|
|
|
|
|
|
ElDoc mode is a buffer-local minor mode. When enabled, the echo
|
|
|
|
|
area displays information about a function or variable in the
|
|
|
|
|
text where point is. If point is on a documented variable, it
|
|
|
|
|
displays the first line of that variable's doc string. Otherwise
|
|
|
|
|
it displays the argument list of the function called in the
|
2020-03-12 22:21:19 +00:00
|
|
|
|
expression point is on." :lighter eldoc-minor-mode-string
|
1997-02-19 10:24:26 +00:00
|
|
|
|
(setq eldoc-last-message nil)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(cond
|
2017-05-30 22:29:34 +00:00
|
|
|
|
((not (eldoc--supported-p))
|
2017-05-29 23:55:28 +00:00
|
|
|
|
(when (called-interactively-p 'any)
|
|
|
|
|
(message "There is no ElDoc support in this buffer"))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(setq eldoc-mode nil))
|
|
|
|
|
(eldoc-mode
|
|
|
|
|
(when eldoc-print-after-edit
|
|
|
|
|
(setq-local eldoc-message-commands (eldoc-edit-message-commands)))
|
2020-03-12 22:21:19 +00:00
|
|
|
|
(add-hook 'post-command-hook #'eldoc-schedule-timer nil t)
|
|
|
|
|
(add-hook 'pre-command-hook #'eldoc-pre-command-refresh-echo-area nil t))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(t
|
|
|
|
|
(kill-local-variable 'eldoc-message-commands)
|
2020-03-12 22:21:19 +00:00
|
|
|
|
(remove-hook 'post-command-hook #'eldoc-schedule-timer t)
|
|
|
|
|
(remove-hook 'pre-command-hook #'eldoc-pre-command-refresh-echo-area t)
|
2016-04-29 20:06:37 +00:00
|
|
|
|
(when eldoc-timer
|
|
|
|
|
(cancel-timer eldoc-timer)
|
|
|
|
|
(setq eldoc-timer nil)))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2017-05-29 23:55:28 +00:00
|
|
|
|
(define-globalized-minor-mode global-eldoc-mode eldoc-mode turn-on-eldoc-mode
|
2014-10-15 17:32:41 +00:00
|
|
|
|
:initialize 'custom-initialize-delay
|
2019-08-04 00:19:31 +00:00
|
|
|
|
:init-value t
|
|
|
|
|
;; For `read--expression', the usual global mode mechanism of
|
|
|
|
|
;; `change-major-mode-hook' runs in the minibuffer before
|
|
|
|
|
;; `eldoc-documentation-function' is set, so `turn-on-eldoc-mode'
|
|
|
|
|
;; does nothing. Configure and enable eldoc from
|
|
|
|
|
;; `eval-expression-minibuffer-setup-hook' instead.
|
|
|
|
|
(if global-eldoc-mode
|
|
|
|
|
(add-hook 'eval-expression-minibuffer-setup-hook
|
|
|
|
|
#'eldoc--eval-expression-setup)
|
|
|
|
|
(remove-hook 'eval-expression-minibuffer-setup-hook
|
|
|
|
|
#'eldoc--eval-expression-setup)))
|
|
|
|
|
|
|
|
|
|
(defun eldoc--eval-expression-setup ()
|
|
|
|
|
;; Setup `eldoc', similar to `emacs-lisp-mode'. FIXME: Call
|
|
|
|
|
;; `emacs-lisp-mode' itself?
|
2020-02-25 22:53:04 +00:00
|
|
|
|
(add-hook 'eldoc-documentation-functions
|
|
|
|
|
#'elisp-eldoc-documentation-function nil t)
|
2019-08-04 00:19:31 +00:00
|
|
|
|
(eldoc-mode +1))
|
2013-03-17 15:00:37 +00:00
|
|
|
|
|
1995-11-12 21:04:08 +00:00
|
|
|
|
;;;###autoload
|
2017-05-29 23:55:28 +00:00
|
|
|
|
(defun turn-on-eldoc-mode ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Turn on `eldoc-mode' if the buffer has ElDoc support enabled.
|
2017-05-29 23:55:28 +00:00
|
|
|
|
See `eldoc-documentation-function' for more detail."
|
2017-05-30 22:29:34 +00:00
|
|
|
|
(when (eldoc--supported-p)
|
2017-05-29 23:55:28 +00:00
|
|
|
|
(eldoc-mode 1)))
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
1998-09-19 02:15:26 +00:00
|
|
|
|
|
1997-02-03 06:13:34 +00:00
|
|
|
|
(defun eldoc-schedule-timer ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Ensure `eldoc-timer' is running.
|
|
|
|
|
|
|
|
|
|
If the user has changed `eldoc-idle-delay', update the timer to
|
|
|
|
|
reflect the change."
|
1997-02-03 06:13:34 +00:00
|
|
|
|
(or (and eldoc-timer
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(memq eldoc-timer timer-idle-list)) ;FIXME: Why?
|
1997-02-03 06:13:34 +00:00
|
|
|
|
(setq eldoc-timer
|
2013-03-18 09:16:15 +00:00
|
|
|
|
(run-with-idle-timer
|
2015-07-21 13:57:58 +00:00
|
|
|
|
eldoc-idle-delay nil
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(lambda ()
|
|
|
|
|
(when (or eldoc-mode
|
2014-12-11 02:56:33 +00:00
|
|
|
|
(and global-eldoc-mode
|
2017-07-22 08:09:36 +00:00
|
|
|
|
(eldoc--supported-p)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(eldoc-print-current-symbol-info))))))
|
1997-02-03 06:13:34 +00:00
|
|
|
|
|
|
|
|
|
;; If user has changed the idle delay, update the timer.
|
|
|
|
|
(cond ((not (= eldoc-idle-delay eldoc-current-idle-delay))
|
|
|
|
|
(setq eldoc-current-idle-delay eldoc-idle-delay)
|
|
|
|
|
(timer-set-idle-time eldoc-timer eldoc-idle-delay t))))
|
|
|
|
|
|
2013-03-17 15:00:37 +00:00
|
|
|
|
(defvar eldoc-mode-line-string nil)
|
|
|
|
|
(put 'eldoc-mode-line-string 'risky-local-variable t)
|
|
|
|
|
|
|
|
|
|
(defun eldoc-minibuffer-message (format-string &rest args)
|
|
|
|
|
"Display messages in the mode-line when in the minibuffer.
|
|
|
|
|
Otherwise work like `message'."
|
|
|
|
|
(if (minibufferp)
|
|
|
|
|
(progn
|
2013-12-04 04:42:01 +00:00
|
|
|
|
(add-hook 'minibuffer-exit-hook
|
2014-03-10 05:33:31 +00:00
|
|
|
|
(lambda () (setq eldoc-mode-line-string nil
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; https://debbugs.gnu.org/16920
|
2014-03-10 05:33:31 +00:00
|
|
|
|
eldoc-last-message nil))
|
2013-12-04 04:42:01 +00:00
|
|
|
|
nil t)
|
2013-03-17 15:00:37 +00:00
|
|
|
|
(with-current-buffer
|
|
|
|
|
(window-buffer
|
|
|
|
|
(or (window-in-direction 'above (minibuffer-window))
|
|
|
|
|
(minibuffer-selected-window)
|
|
|
|
|
(get-largest-window)))
|
2017-10-21 08:41:28 +00:00
|
|
|
|
(when mode-line-format
|
2013-03-17 15:00:37 +00:00
|
|
|
|
(unless (and (listp mode-line-format)
|
|
|
|
|
(assq 'eldoc-mode-line-string mode-line-format))
|
|
|
|
|
(setq mode-line-format
|
|
|
|
|
(list "" '(eldoc-mode-line-string
|
|
|
|
|
(" " eldoc-mode-line-string " "))
|
2017-10-21 08:41:28 +00:00
|
|
|
|
mode-line-format))))
|
2013-12-04 04:42:01 +00:00
|
|
|
|
(setq eldoc-mode-line-string
|
|
|
|
|
(when (stringp format-string)
|
More-conservative ‘format’ quote restyling
Instead of restyling curved quotes for every call to ‘format’,
create a new function ‘format-message’ that does the restyling,
and using the new function instead of ‘format’ only in contexts
where this seems appropriate.
Problem reported by Dmitry Gutov and Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
* doc/lispref/commands.texi (Using Interactive):
* doc/lispref/control.texi (Signaling Errors, Signaling Errors):
* doc/lispref/display.texi (Displaying Messages, Progress):
* doc/lispref/elisp.texi:
* doc/lispref/help.texi (Keys in Documentation):
* doc/lispref/minibuf.texi (Minibuffer Misc):
* doc/lispref/strings.texi (Formatting Strings):
* etc/NEWS:
Document the changes.
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/apropos.el (apropos-library):
* lisp/calc/calc-ext.el (calc-record-message)
(calc-user-function-list):
* lisp/calc/calc-help.el (calc-describe-key, calc-full-help):
* lisp/calc/calc-lang.el (math-read-big-balance):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--add-diary-entry):
* lisp/cedet/mode-local.el (mode-local-print-binding)
(mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/cedet/semantic/edit.el (semantic-parse-changes-failed):
* lisp/cedet/semantic/wisent/comp.el (wisent-log):
* lisp/cedet/srecode/insert.el (srecode-insert-show-error-report):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dframe.el (dframe-message):
* lisp/dired-aux.el (dired-query):
* lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1):
* lisp/emacs-lisp/bytecomp.el (byte-compile-log)
(byte-compile-log-file, byte-compile-warn, byte-compile-form):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use)
(cconv-analyze-form):
* lisp/emacs-lisp/check-declare.el (check-declare-warn):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet):
* lisp/emacs-lisp/edebug.el (edebug-format):
* lisp/emacs-lisp/eieio-core.el (eieio-oref):
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message)
(eldoc-message):
* lisp/emacs-lisp/elint.el (elint-file, elint-log):
* lisp/emacs-lisp/find-func.el (find-function-library):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
* lisp/emacs-lisp/package.el (package-compute-transaction)
(package-install-button-action, package-delete-button-action)
(package-menu--list-to-prompt):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emacs-lisp/warnings.el (lwarn, warn):
* lisp/emulation/viper-cmd.el:
(viper-toggle-parse-sexp-ignore-comments)
(viper-kill-buffer, viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/facemenu.el (facemenu-add-new-face):
* lisp/faces.el (face-documentation, read-face-name)
(face-read-string, read-face-font, describe-face):
* lisp/files.el (find-alternate-file, hack-local-variables)
(hack-one-local-variable--obsolete, write-file)
(basic-save-buffer, delete-directory):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--obsolete)
(help-fns--interactive-only, describe-function-1)
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/info-xref.el (info-xref-output):
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
* lisp/international/kkc.el (kkc-error):
* lisp/international/mule-cmds.el:
(select-safe-coding-system-interactively)
(select-safe-coding-system, describe-input-method):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/international/quail.el (quail-error):
* lisp/minibuffer.el (minibuffer-message):
* lisp/mpc.el (mpc--debug):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-message):
* lisp/net/gnutls.el (gnutls-message-maybe):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/nsm.el (nsm-query-user):
* lisp/net/rlogin.el (rlogin):
* lisp/net/soap-client.el (soap-warning):
* lisp/net/tramp.el (tramp-debug-message):
* lisp/nxml/nxml-outln.el (nxml-report-outline-error):
* lisp/nxml/nxml-parse.el (nxml-parse-error):
* lisp/nxml/rng-cmpct.el (rng-c-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/org/org-ctags.el:
(org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/proced.el (proced-log):
* lisp/progmodes/ebnf2ps.el (ebnf-log):
* lisp/progmodes/flymake.el (flymake-log):
* lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle):
* lisp/replace.el (occur-1):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, define-alternatives):
* lisp/startup.el (command-line):
* lisp/subr.el (error, user-error, add-to-list):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* src/callint.c (Fcall_interactively):
* src/editfns.c (Fmessage, Fmessage_box):
Restyle the quotes of format strings intended for use as a
diagnostic, when restyling seems appropriate.
* lisp/subr.el (format-message): New function.
* src/doc.c (Finternal__text_restyle): New function.
(syms_of_doc): Define it.
2015-08-24 05:38:02 +00:00
|
|
|
|
(apply #'format-message format-string args)))
|
2013-12-04 04:42:01 +00:00
|
|
|
|
(force-mode-line-update)))
|
2020-03-12 22:21:19 +00:00
|
|
|
|
(apply #'message format-string args)))
|
2013-03-17 15:00:37 +00:00
|
|
|
|
|
2017-08-20 21:26:45 +00:00
|
|
|
|
(defun eldoc-message (&optional string)
|
|
|
|
|
"Display STRING as an ElDoc message if it's non-nil.
|
2017-07-22 08:09:36 +00:00
|
|
|
|
|
2017-08-20 21:26:45 +00:00
|
|
|
|
Also store it in `eldoc-last-message' and return that value."
|
1997-02-19 10:24:26 +00:00
|
|
|
|
(let ((omessage eldoc-last-message))
|
2017-08-20 21:26:45 +00:00
|
|
|
|
(setq eldoc-last-message string)
|
2020-03-12 22:21:19 +00:00
|
|
|
|
;; Do not put eldoc messages in the log since they are Legion.
|
2003-02-11 00:11:55 +00:00
|
|
|
|
;; Emacs way of preventing log messages.
|
|
|
|
|
(let ((message-log-max nil))
|
2013-03-17 15:00:37 +00:00
|
|
|
|
(cond (eldoc-last-message
|
|
|
|
|
(funcall eldoc-message-function "%s" eldoc-last-message))
|
|
|
|
|
(omessage (funcall eldoc-message-function nil)))))
|
1997-02-19 10:24:26 +00:00
|
|
|
|
eldoc-last-message)
|
|
|
|
|
|
2014-01-21 13:09:55 +00:00
|
|
|
|
(defun eldoc--message-command-p (command)
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Return non-nil if COMMAND is in `eldoc-message-commands'."
|
2014-01-21 13:09:55 +00:00
|
|
|
|
(and (symbolp command)
|
|
|
|
|
(intern-soft (symbol-name command) eldoc-message-commands)))
|
|
|
|
|
|
2020-03-12 22:21:19 +00:00
|
|
|
|
;; This function goes on pre-command-hook.
|
|
|
|
|
;; Motion commands clear the echo area for some reason,
|
1998-09-19 02:15:26 +00:00
|
|
|
|
;; which make eldoc messages flicker or disappear just before motion
|
|
|
|
|
;; begins. This function reprints the last eldoc message immediately
|
|
|
|
|
;; before the next command executes, which does away with the flicker.
|
|
|
|
|
;; This doesn't seem to be required for Emacs 19.28 and earlier.
|
2020-03-12 22:21:19 +00:00
|
|
|
|
;; FIXME: The above comment suggests we don't really understand why
|
|
|
|
|
;; this is needed. Maybe it's not needed any more, but if it is
|
|
|
|
|
;; we should figure out why.
|
1998-09-19 02:15:26 +00:00
|
|
|
|
(defun eldoc-pre-command-refresh-echo-area ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Reprint `eldoc-last-message' in the echo area."
|
1998-09-19 02:15:26 +00:00
|
|
|
|
(and eldoc-last-message
|
2014-01-21 13:09:55 +00:00
|
|
|
|
(not (minibufferp)) ;We don't use the echo area when in minibuffer.
|
2014-01-12 04:00:03 +00:00
|
|
|
|
(if (and (eldoc-display-message-no-interference-p)
|
2014-01-21 13:09:55 +00:00
|
|
|
|
(eldoc--message-command-p this-command))
|
2014-01-12 04:00:03 +00:00
|
|
|
|
(eldoc-message eldoc-last-message)
|
2014-01-21 13:09:55 +00:00
|
|
|
|
;; No need to call eldoc-message since the echo area will be cleared
|
|
|
|
|
;; for us, but do note that the last-message will be gone.
|
1998-09-19 02:15:26 +00:00
|
|
|
|
(setq eldoc-last-message nil))))
|
1997-02-04 18:21:29 +00:00
|
|
|
|
|
|
|
|
|
;; Decide whether now is a good time to display a message.
|
|
|
|
|
(defun eldoc-display-message-p ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Return non-nil when it is appropriate to display an ElDoc message."
|
1997-02-19 10:24:26 +00:00
|
|
|
|
(and (eldoc-display-message-no-interference-p)
|
2013-03-18 09:16:15 +00:00
|
|
|
|
;; If this-command is non-nil while running via an idle
|
|
|
|
|
;; timer, we're still in the middle of executing a command,
|
|
|
|
|
;; e.g. a query-replace where it would be annoying to
|
|
|
|
|
;; overwrite the echo area.
|
2014-01-21 13:09:55 +00:00
|
|
|
|
(not this-command)
|
|
|
|
|
(eldoc--message-command-p last-command)))
|
|
|
|
|
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
2000-07-24 00:38:34 +00:00
|
|
|
|
;; Check various conditions about the current environment that might make
|
|
|
|
|
;; it undesirable to print eldoc messages right this instant.
|
1997-02-19 10:24:26 +00:00
|
|
|
|
(defun eldoc-display-message-no-interference-p ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Return nil if displaying a message would cause interference."
|
2014-01-12 04:00:03 +00:00
|
|
|
|
(not (or executing-kbd-macro (bound-and-true-p edebug-active))))
|
1997-02-19 10:24:26 +00:00
|
|
|
|
|
1998-09-19 02:15:26 +00:00
|
|
|
|
|
2020-02-25 22:53:04 +00:00
|
|
|
|
(defvar eldoc-documentation-functions nil
|
|
|
|
|
"Hook for functions to call to return doc string.
|
|
|
|
|
Each function should accept no arguments and return a one-line
|
|
|
|
|
string for displaying doc about a function etc. appropriate to
|
|
|
|
|
the context around point. It should return nil if there's no doc
|
|
|
|
|
appropriate for the context. Typically doc is returned if point
|
|
|
|
|
is on a function-like name or in its arg list.
|
|
|
|
|
|
|
|
|
|
Major modes should modify this hook locally, for example:
|
|
|
|
|
(add-hook \\='eldoc-documentation-functions #\\='foo-mode-eldoc nil t)
|
|
|
|
|
so that the global value (i.e. the default value of the hook) is
|
|
|
|
|
taken into account if the major mode specific function does not
|
|
|
|
|
return any documentation.")
|
|
|
|
|
|
|
|
|
|
(defun eldoc-documentation-default ()
|
|
|
|
|
"Show first doc string for item at point.
|
|
|
|
|
Default value for `eldoc-documentation-function'."
|
|
|
|
|
(let ((res (run-hook-with-args-until-success 'eldoc-documentation-functions)))
|
|
|
|
|
(when res
|
|
|
|
|
(if eldoc-echo-area-use-multiline-p res
|
|
|
|
|
(truncate-string-to-width
|
|
|
|
|
res (1- (window-width (minibuffer-window))))))))
|
|
|
|
|
|
|
|
|
|
(defun eldoc-documentation-compose ()
|
|
|
|
|
"Show multiple doc string results at once.
|
|
|
|
|
Meant as a value for `eldoc-documentation-function'."
|
|
|
|
|
(let (res)
|
|
|
|
|
(run-hook-wrapped
|
|
|
|
|
'eldoc-documentation-functions
|
|
|
|
|
(lambda (f)
|
|
|
|
|
(let ((str (funcall f)))
|
|
|
|
|
(when str (push str res))
|
|
|
|
|
nil)))
|
|
|
|
|
(when res
|
|
|
|
|
(setq res (mapconcat #'identity (nreverse res) ", "))
|
|
|
|
|
(if eldoc-echo-area-use-multiline-p res
|
|
|
|
|
(truncate-string-to-width
|
|
|
|
|
res (1- (window-width (minibuffer-window))))))))
|
|
|
|
|
|
|
|
|
|
(defcustom eldoc-documentation-function #'eldoc-documentation-default
|
2014-03-31 01:31:17 +00:00
|
|
|
|
"Function to call to return doc string.
|
2003-09-06 17:32:31 +00:00
|
|
|
|
The function of no args should return a one-line string for displaying
|
2020-03-12 22:21:19 +00:00
|
|
|
|
doc about a function etc. appropriate to the context around point.
|
2003-09-06 17:32:31 +00:00
|
|
|
|
It should return nil if there's no doc appropriate for the context.
|
|
|
|
|
Typically doc is returned if point is on a function-like name or in its
|
|
|
|
|
arg list.
|
|
|
|
|
|
2009-01-16 03:24:54 +00:00
|
|
|
|
The result is used as is, so the function must explicitly handle
|
|
|
|
|
the variables `eldoc-argument-case' and `eldoc-echo-area-use-multiline-p',
|
|
|
|
|
and the face `eldoc-highlight-function-argument', if they are to have any
|
2020-02-25 22:53:04 +00:00
|
|
|
|
effect."
|
|
|
|
|
:link '(info-link "(emacs) Lisp Doc")
|
|
|
|
|
:type '(radio (function-item eldoc-documentation-default)
|
|
|
|
|
(function-item eldoc-documentation-compose)
|
2020-02-27 03:47:32 +00:00
|
|
|
|
(function :tag "Other function"))
|
2020-03-12 22:21:19 +00:00
|
|
|
|
:version "28.1")
|
2003-09-06 17:32:31 +00:00
|
|
|
|
|
2020-02-27 03:47:32 +00:00
|
|
|
|
(defun eldoc--supported-p ()
|
|
|
|
|
"Non-nil if an ElDoc function is set for this buffer."
|
|
|
|
|
(and (not (memq eldoc-documentation-function '(nil ignore)))
|
2020-03-12 15:18:07 +00:00
|
|
|
|
(or eldoc-documentation-functions
|
|
|
|
|
;; The old API had major modes set `eldoc-documentation-function'
|
|
|
|
|
;; to provide eldoc support. It's impossible now to determine
|
|
|
|
|
;; reliably whether the `eldoc-documentation-function' provides
|
|
|
|
|
;; eldoc support (as in the old API) or whether it just provides
|
|
|
|
|
;; a way to combine the results of the
|
|
|
|
|
;; `eldoc-documentation-functions' (as in the new API).
|
|
|
|
|
;; But at least if it's set buffer-locally it's a good hint that
|
|
|
|
|
;; there's some eldoc support in the current buffer.
|
|
|
|
|
(local-variable-p 'eldoc-documentation-function))))
|
2020-02-27 03:47:32 +00:00
|
|
|
|
|
1998-09-19 02:15:26 +00:00
|
|
|
|
(defun eldoc-print-current-symbol-info ()
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Print the text produced by `eldoc-documentation-function'."
|
2013-09-12 05:32:57 +00:00
|
|
|
|
;; This is run from post-command-hook or some idle timer thing,
|
|
|
|
|
;; so we need to be careful that errors aren't ignored.
|
|
|
|
|
(with-demoted-errors "eldoc error: %s"
|
2018-12-04 23:15:44 +00:00
|
|
|
|
(if (not (eldoc-display-message-p))
|
|
|
|
|
;; Erase the last message if we won't display a new one.
|
|
|
|
|
(when eldoc-last-message
|
|
|
|
|
(eldoc-message nil))
|
|
|
|
|
(let ((non-essential t))
|
|
|
|
|
;; Only keep looking for the info as long as the user hasn't
|
|
|
|
|
;; requested our attention. This also locally disables inhibit-quit.
|
|
|
|
|
(while-no-input
|
2020-02-27 03:47:32 +00:00
|
|
|
|
(eldoc-message (funcall eldoc-documentation-function)))))))
|
2014-03-31 01:31:17 +00:00
|
|
|
|
|
2015-05-06 02:18:19 +00:00
|
|
|
|
;; If the entire line cannot fit in the echo area, the symbol name may be
|
|
|
|
|
;; truncated or eliminated entirely from the output to make room for the
|
|
|
|
|
;; description.
|
|
|
|
|
(defun eldoc-docstring-format-sym-doc (prefix doc &optional face)
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Combine PREFIX and DOC, and shorten the result to fit in the echo area.
|
|
|
|
|
|
|
|
|
|
When PREFIX is a symbol, propertize its symbol name with FACE
|
|
|
|
|
before combining it with DOC. If FACE is not provided, just
|
|
|
|
|
apply the nil face.
|
|
|
|
|
|
|
|
|
|
See also: `eldoc-echo-area-use-multiline-p'."
|
2015-05-06 02:18:19 +00:00
|
|
|
|
(when (symbolp prefix)
|
|
|
|
|
(setq prefix (concat (propertize (symbol-name prefix) 'face face) ": ")))
|
|
|
|
|
(let* ((ea-multi eldoc-echo-area-use-multiline-p)
|
|
|
|
|
;; Subtract 1 from window width since emacs will not write
|
|
|
|
|
;; any chars to the last column, or in later versions, will
|
|
|
|
|
;; cause a wraparound and resize of the echo area.
|
|
|
|
|
(ea-width (1- (window-width (minibuffer-window))))
|
|
|
|
|
(strip (- (+ (length prefix) (length doc)) ea-width)))
|
|
|
|
|
(cond ((or (<= strip 0)
|
|
|
|
|
(eq ea-multi t)
|
|
|
|
|
(and ea-multi (> (length doc) ea-width)))
|
|
|
|
|
(concat prefix doc))
|
|
|
|
|
((> (length doc) ea-width)
|
|
|
|
|
(substring (format "%s" doc) 0 ea-width))
|
|
|
|
|
((>= strip (string-match-p ":? *\\'" prefix))
|
|
|
|
|
doc)
|
|
|
|
|
(t
|
|
|
|
|
;; Show the end of the partial symbol name, rather
|
|
|
|
|
;; than the beginning, since the former is more likely
|
|
|
|
|
;; to be unique given package namespace conventions.
|
|
|
|
|
(concat (substring prefix strip) doc)))))
|
|
|
|
|
|
1997-02-19 10:24:26 +00:00
|
|
|
|
;; When point is in a sexp, the function args are not reprinted in the echo
|
|
|
|
|
;; area after every possible interactive command because some of them print
|
|
|
|
|
;; their own messages in the echo area; the eldoc functions would instantly
|
|
|
|
|
;; overwrite them unless it is more restrained.
|
|
|
|
|
;; These functions do display-command table management.
|
|
|
|
|
|
|
|
|
|
(defun eldoc-add-command (&rest cmds)
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Add each of CMDS to the obarray `eldoc-message-commands'."
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(dolist (name cmds)
|
|
|
|
|
(and (symbolp name)
|
|
|
|
|
(setq name (symbol-name name)))
|
|
|
|
|
(set (intern name eldoc-message-commands) t)))
|
1997-02-19 10:24:26 +00:00
|
|
|
|
|
|
|
|
|
(defun eldoc-add-command-completions (&rest names)
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Pass every prefix completion of NAMES to `eldoc-add-command'."
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(dolist (name names)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(apply #'eldoc-add-command (all-completions name obarray 'commandp))))
|
1997-02-19 10:24:26 +00:00
|
|
|
|
|
|
|
|
|
(defun eldoc-remove-command (&rest cmds)
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Remove each of CMDS from the obarray `eldoc-message-commands'."
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(dolist (name cmds)
|
|
|
|
|
(and (symbolp name)
|
|
|
|
|
(setq name (symbol-name name)))
|
|
|
|
|
(unintern name eldoc-message-commands)))
|
1997-02-19 10:24:26 +00:00
|
|
|
|
|
|
|
|
|
(defun eldoc-remove-command-completions (&rest names)
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"Pass every prefix completion of NAMES to `eldoc-remove-command'."
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(dolist (name names)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-27 03:57:41 +00:00
|
|
|
|
(apply #'eldoc-remove-command
|
2005-10-04 21:49:09 +00:00
|
|
|
|
(all-completions name eldoc-message-commands))))
|
1997-02-19 10:24:26 +00:00
|
|
|
|
|
1998-09-19 02:15:26 +00:00
|
|
|
|
|
1997-02-19 10:24:26 +00:00
|
|
|
|
;; Prime the command list.
|
|
|
|
|
(eldoc-add-command-completions
|
2015-10-17 15:49:36 +00:00
|
|
|
|
"back-to-indentation"
|
2010-06-01 13:47:14 +00:00
|
|
|
|
"backward-" "beginning-of-" "delete-other-windows" "delete-window"
|
|
|
|
|
"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-"
|
2017-07-22 08:09:36 +00:00
|
|
|
|
"move-end-of-" "newline" "next-" "other-window" "pop-global-mark"
|
|
|
|
|
"previous-" "recenter" "right-" "scroll-" "self-insert-command"
|
|
|
|
|
"split-window-" "up-list")
|
1995-11-12 21:04:08 +00:00
|
|
|
|
|
|
|
|
|
(provide 'eldoc)
|
|
|
|
|
|
|
|
|
|
;;; eldoc.el ends here
|