merge trunk

2 files changed, 5 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 855bb93a1f0..4f83227c8dc 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1839,7 +1839,7 @@
 2006-11-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
 
         * emacs.py (eargs): Provide eldoc message for builtin types.
-          Make sure eargs always outputs sentinel, to avoid Emacs freeze.
+        Make sure eargs always outputs sentinel, to avoid Emacs freeze.
 
 2006-10-22  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -4646,8 +4646,8 @@
 1990-01-19  David Lawrence  (tale@cocoa-puffs)
 
         * timer.c, getdate.y (new files) and Makefile:
-          Sub-process support for run-at-time in timer.el.
-          Doesn't yet work correctly for USG.
+        Sub-process support for run-at-time in timer.el.
+        Doesn't yet work correctly for USG.
 
 1990-01-10  Jim Kingdon  (kingdon@pogo)
 
diff --git a/etc/NEWS b/etc/NEWS
index d20a87e76e9..c4393a53efe 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,8 @@ You can disable this by using --without-selinux.
 
 * Changes in Emacs 24.1
 
+** Completion can cycle, depending on completion-cycle-threshold.
+
 ** auto-mode-case-fold is now enabled by default.
 
 +++