master 56a8559: Combine and reconcile two conflicting entries in NEWS on goto-line-history

[Alan Mackenzie]

branch: master
commit 56a85590766ec8592100db38937d10b096e9ce30
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>

    Combine and reconcile two conflicting entries in NEWS on goto-line-history
    
    * etc/NEWS: Amend.
    
    * doc/lispref/minibuf.texi (Minibuffer History): Amend the entry about
    goto-line-history, which is now buffer local only after being so customized.
---
 doc/lispref/minibuf.texi |  5 +++--
 etc/NEWS                 | 15 ++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index b60775d..bbc8340 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -701,8 +701,9 @@ A history list for numbers read by @code{read-number}.
 @end defvar
 
 @defvar goto-line-history
-A history list for arguments to @code{goto-line}.  This variable is
-buffer local.
+A history list for arguments to @code{goto-line}.  This variable can
+be made local in every buffer by customizing the user option
+@code{goto-line-history-local}.
 @end defvar
 
 @c Less common: coding-system-history, input-method-history,
diff --git a/etc/NEWS b/etc/NEWS
index 883c070..3db2761 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -305,10 +305,12 @@ Additionally, the function now accepts a HIST argument 
which can be
 used to specify a custom history variable.
 
 +++
-** Input history for 'goto-line' is now local to every buffer.
-Each buffer will keep a separate history of line numbers used with
-'goto-line'.  This should help making faster the process of finding
-line numbers that were previously jumped to.
+** Input history for 'goto-line' can now be made local to every buffer.
+In any event, line numbers used with 'goto-line' are kept in their own
+history list.  This should help make faster the process of finding
+line numbers that were previously jumped to.  By default, all buffers
+share a single history list.  To make every buffer have its own
+history list, customize the user option 'goto-line-history-local'.
 
 +++
 ** New command 'goto-line-relative' to use in a narrowed buffer.
@@ -352,11 +354,6 @@ trying to be non-destructive.
 This command opens a new buffer called "*Memory Report*" and gives a
 summary of where Emacs is using memory currently.
 
-+++
-** The history list for the 'goto-line' command is now a single list
-for all buffers by default.  You can configure a separate list for
-each buffer by customizing the user option 'goto-line-history-local'.
-
 ** Outline
 
 +++