aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-12-16 17:18:45 +0200
committerEli Zaretskii2015-12-16 17:18:45 +0200
commit972830c019122e2167b0367516b534fd2f16a320 (patch)
treefe743fd6f6c320c6c922787e4f006fecbba88b88
parent6d4ae9d33870c3024845b06cfb2fae2a225a0bbc (diff)
downloademacs-972830c019122e2167b0367516b534fd2f16a320.tar.gz
emacs-972830c019122e2167b0367516b534fd2f16a320.zip
; * doc/emacs/programs.texi (Lisp Doc): Clarify last change.
-rw-r--r--doc/emacs/programs.texi6
-rw-r--r--etc/NEWS4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index e6871e3ff34..39839029d24 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1268,9 +1268,9 @@ information whenever there is a Lisp function or variable at point;
1268for a function, it shows the argument list, and for a variable it 1268for a function, it shows the argument list, and for a variable it
1269shows the first line of the variable's documentation string. To 1269shows the first line of the variable's documentation string. To
1270toggle Eldoc mode, type @kbd{M-x eldoc-mode}. There's also a Global 1270toggle Eldoc mode, type @kbd{M-x eldoc-mode}. There's also a Global
1271Eldoc mode, which is turned on by default in buffers whose major mode 1271Eldoc mode, which is turned on by default, and turns Eldoc mode on in
1272is Emacs Lisp or Lisp Interaction (@kbd{M-x global-eldoc-mode} to turn 1272buffers whose major mode is Emacs Lisp or Lisp Interaction (@kbd{M-x
1273it off). 1273global-eldoc-mode} to turn it off globally).
1274 1274
1275@node Hideshow 1275@node Hideshow
1276@section Hideshow minor mode 1276@section Hideshow minor mode
diff --git a/etc/NEWS b/etc/NEWS
index 4c5ce3e4207..2b145762faa 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -557,8 +557,8 @@ instrumented function.
557 557
558+++ 558+++
559*** New minor mode `global-eldoc-mode' 559*** New minor mode `global-eldoc-mode'
560It is turned on by default in `*scratch*' and other buffers whose 560It is turned on by default, and turns on `eldoc-mode' in `*scratch*'
561major mode supports Emacs Lisp. 561and other buffers whose major mode supports Emacs Lisp.
562 562
563--- 563---
564*** `eldoc-documentation-function' now defaults to `ignore' 564*** `eldoc-documentation-function' now defaults to `ignore'