Merged from miles@gnu.org--gnu-2005 (patch 610-614)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-610
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-611
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-612
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-613
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-614
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-429

2 files changed, 5 insertions, 10 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 68194266dd6..3204ed9cb0c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * FOR-RELEASE (New features): max-image-size implemented.
+        (Bugs): split-window done, by Kim F. Storm.
+
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
         * FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index ba744a621c6..91b27e0d0b0 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -39,13 +39,6 @@ bitmap usage to a bitmap name, and second level maps bitmap name to
 a bitmap appearence.
 [Assigned to KFS]
 
-** Put a max-limit on the size of images, e.g. based on the display size.
-This is to avoid allocating insane amounts of memory due to bogus
-image size specifications.
-Note: rather than clipping images that are too big (this may be
-non-trivial to do correctly in all cases -- and thus non-trivial to
-test), it may be better just to avoid displaying such images for emacs 22.
-
 * FATAL ERRORS
 
 ** Investigate reported crashes in compact_small_strings.
@@ -55,9 +48,6 @@ invalid pointer from string_free_list.
 
 * BUGS
 
-** Make a new interface for specifying window configurations
-so that we can fix bugs in balance-windows.
-
 ** TCP server processes do not work on Windows.
 
 TCP/IP server processes created with `make-network-process' consume