diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-07-11 09:25:04 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-07-11 09:25:04 -0700 |
| commit | 398a2680616112675afe26478706a3cea9e76158 (patch) | |
| tree | 24751dcc7238b3b65612f670569f10484f1d9fcd /doc/emacs/programs.texi | |
| parent | 6cc35829e4772479abed1f46f0c51daa24d070e0 (diff) | |
| parent | c04b92104c2bc4c1a719e06fbe11045a204c36a0 (diff) | |
| download | emacs-398a2680616112675afe26478706a3cea9e76158.tar.gz | |
Merge from origin/emacs-27
c04b92104c Add commentary in gtkutil.c
6290850dac Consistently stylize eldoc as ElDoc in prose
136e931189 Improve documentation of "C-u C-x ="
1f52771fd3 Mention floating rounding issues
c892ae65b4 Repair global-auto-revert-ignore-modes (bug#42271)
3a446a02fb ; * src/xdisp.c (decode_mode_spec): Fix commentary.
79f381b4a6 One more improvement of left/right-fringe display spec docs
1279bdb072 Another clarification of left/right-fringe display spec
# Conflicts:
# doc/emacs/programs.texi
Diffstat (limited to 'doc/emacs/programs.texi')
| -rw-r--r-- | doc/emacs/programs.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 2757c84b53a..1c33d7dccc7 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1260,16 +1260,16 @@ the WoMan Info manual, which is distributed with Emacs. to view the built-in documentation for the Lisp functions and variables that you want to use. @xref{Name Help}. -@cindex Eldoc mode +@cindex ElDoc mode @findex eldoc-mode @findex global-eldoc-mode - Eldoc is a buffer-local minor mode that helps with looking up Lisp + ElDoc is a buffer-local minor mode that helps with looking up Lisp documentation. When it is enabled, the echo area displays some useful information whenever there is a Lisp function or variable at point; for a function, it shows the argument list, and for a variable it shows the first line of the variable's documentation string. To -toggle Eldoc mode, type @kbd{M-x eldoc-mode}. There's also a Global -Eldoc mode, which is turned on by default, and affects buffers whose +toggle ElDoc mode, type @kbd{M-x eldoc-mode}. There's also a Global +ElDoc mode, which is turned on by default, and affects buffers whose major mode sets the variables described below. Use @w{@kbd{M-x global-eldoc-mode}} to turn it off globally. |