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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 97-112)

   - Update from CVS
   - Merge from erc--emacs--0
   - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.
   - Merge from gnus--rel--5.10

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

   - Update from CVS

2 files changed, 25 insertions, 8 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1b855f7c4ed..1543c17d3a6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-20  Kim F. Storm  <storm@cua.dk>
+
+        * FOR-RELEASE (NEW FEATURES): Completed work on this item:
+        Rework how fringe bitmaps are defined and used.
+        Currently, bitmap usage and bitmap appearence are "mixed-up" in a
+        one-level representation.  It would be cleaner to split the
+        representation into a two-level model where first level maps
+        bitmap usage to a bitmap name, and second level maps bitmap name to
+        a bitmap appearence.
+
 2006-01-27  Chong Yidong  <cyd@stupidchicken.com>
 
         * FOR-RELEASE: string allocation bugs fixed.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index ab17c84eab9..ef73ec4436e 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -33,16 +33,14 @@ Assigned to Bill Wohler <wohler@newt.com>.
 
 * NEW FEATURES
 
-** Rework how fringe bitmaps are defined and used.
-Currently, bitmap usage and bitmap appearence are "mixed-up" in a
-one-level representation.  It would be cleaner to split the
-representation into a two-level model where first level maps
-bitmap usage to a bitmap name, and second level maps bitmap name to
-a bitmap appearence.
-[Assigned to KFS]
-
 * BUGS
 
+** Reiner Steib's 23 Jan 2006 bug report that tool bar icons don't update.
+
+** Ralf Angeli's 4 Jul 2005 bug report about scroll-preserve-screen-position.
+
+** Martin Rudalics' 30 Jan 2006 bug report about overlays at end of buffer.
+
 ** TCP server processes do not work on Windows.
 
 TCP/IP server processes created with `make-network-process' consume
@@ -50,6 +48,15 @@ excesive CPU on some Windows environments.  Usages of 50% and 100%
 CPU time have been observed on different Window XP configurations.
 Seems to be a problem in sys_select in w32proc.c.
 
+In its current form, it sys_select says the socket is ready, so we
+call server_accept_connection which again calls accept() which returns
+-1 with errno == WSAEWOULDBLOCK (10035) indicating that there is no
+pending connection to accept.
+
+It seems that to fix this, w32 server sockets must use WSAAsyncSelect
++ FD_ACCEPT to request notifications of incoming connections...
+
+
 * DOCUMENTATION
 
 ** Add a node to the Lisp manual describing key sequences from the