From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 16 Dec 2015 15:18:45 +0000 (+0200)
Subject: ; * doc/emacs/programs.texi (Lisp Doc): Clarify last change.
X-Git-Tag: emacs-25.0.90~459
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=972830c019122e2167b0367516b534fd2f16a320;p=emacs.git

; * doc/emacs/programs.texi (Lisp Doc): Clarify last change.
---

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;
 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 in buffers whose major mode
-is Emacs Lisp or Lisp Interaction (@kbd{M-x global-eldoc-mode} to turn
-it off).
+Eldoc mode, which is turned on by default, and turns Eldoc mode on in
+buffers whose major mode is Emacs Lisp or Lisp Interaction (@kbd{M-x
+global-eldoc-mode} to turn it off globally).
 
 @node Hideshow
 @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.
 
 +++
 *** New minor mode `global-eldoc-mode'
-It is turned on by default in `*scratch*' and other buffers whose
-major mode supports Emacs Lisp.
+It is turned on by default, and turns on `eldoc-mode' in `*scratch*'
+and other buffers whose major mode supports Emacs Lisp.
 
 ---
 *** `eldoc-documentation-function' now defaults to `ignore'