# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1219433316 0
# Node ID 50e32f7ae447fbce8c7603b8ee115d3a3c6ee9c4
# Parent  6e46e4dadd74c982e0930bdc06c9a1fe7f6a8c5e
Consolidate minibuffer and completion changes.

diff -r 6e46e4dadd74 -r 50e32f7ae447 etc/NEWS
--- a/etc/NEWS	Fri Aug 22 19:27:01 2008 +0000
+++ b/etc/NEWS	Fri Aug 22 19:28:36 2008 +0000
@@ -349,7 +349,7 @@
 the mark in Transient Mark mode (e.g., any command that modifies the
 buffer).
 
-** Minibuffer changes
+** Minibuffer and completion changes
 +++
 *** When M-n in the minibuffer reaches the end of the list of defaults,
 it adds the completion list to the end, so next M-n continues putting
@@ -373,7 +373,6 @@
 `keep-lines', `flush-lines' and `how-many'.  This list includes the active
 region in transient-mark-mode, the word under the cursor, the last Isearch
 regexp, the last Isearch string and the last replacement regexp.
-
 ---
 *** When enable-recursive-minibuffers is non-nil, operations which use
 switch-to-buffer (such as C-x b and C-x C-f) do not fail any more when
@@ -394,6 +393,18 @@
 
 *** The variable read-buffer-completion-ignore-case overrides
 completion-ignore-case for buffer name completion.
+---
+*** `completion-styles' can be customized to choose your favorite
+completion style.
+---
+*** The default completion styles include a form of partial-completion.
+---
+*** The new command `minibuffer-force-complete' chooses one of the
+possible completions, rather than stopping at the common prefix.
++++
+*** If `completion-auto-help' is `lazy', Emacs shows the completions
+buffer only on the second attempt to complete.  This was already
+supported in `partial-completion-mode'.
 
 ** Face changes
 
@@ -413,20 +424,6 @@
 *** You can disable kill ring commands from accessing the primary
 selection by setting `x-select-enable-primary' to nil.
 
-** Completion changes
----
-*** `completion-styles' can be customized to choose your favorite
-completion style.
----
-*** The default completion styles include a form of partial-completion.
----
-*** The new command `minibuffer-force-complete' chooses one of the
-possible completions, rather than stopping at the common prefix.
-+++
-*** If `completion-auto-help' is `lazy', Emacs shows the completions
-buffer only on the second attempt to complete.  This was already
-supported in `partial-completion-mode'.
-
 ** Continuation lines can now be wrapped at word boundaries
 (word-wrapping).  This is controlled by the new per-buffer variable
 `word-wrap'.  Word wrapping does not take place if continuation lines