merge from trunk

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6579cc48fd5..b0156e5ac7e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,23 @@
+2012-09-02  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Configurations): Recommend against using
+        save-window-excursion (Bug#12075).
+
+        * control.texi (Catch and Throw):
+        * positions.texi (Excursions): Don't mention it.
+
+2012-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Better seed support for (random).
+        * numbers.texi (Random Numbers): Document new behavior of
+        the calls (random) and (random STRING).
+
+2012-08-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Window Point): Document recent changes in
+        window-point and set-window-point.
+        (Selecting Windows): Document recent change in select-window.
+
 2012-08-06  Eli Zaretskii  <eliz@gnu.org>
 
         * functions.texi (Closures): Put the main index entry for