Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 314-319)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 107)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-78

1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c4c798e6f77..3e523d28f8d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-19  Richard Stallman  <rms@gnu.org>
+
+        * window.c (size_window): New arg FIRST_ONLY.  All callers changed.
+        (adjust_window_trailing_edge): Specially compute FIRST_PARALLEL
+        for the case of a top-level window and the following minibuffer.
+        Don't exit because of no `next' when there is a parent.
+        Use the FIRST_ONLY feature when resizing following windows.
+        
+        * syntax.c (init_syntax_once): Give most control chars' syntax Spunct.
+
 2006-06-17  Kim F. Storm  <storm@cua.dk>
 
         * dispnew.c (update_frame): Check for input pending on entry.