Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
   Add lisp/mh-e/.arch-inventory

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
   Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-142
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-143
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-144
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-145
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-146
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-147
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-148
   Update from CVS

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

2 files changed, 7 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3204ed9cb0c..f5c6da45881 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * FOR-RELEASE: Fringe angle bitmap at eob fixed.
+
 2005-10-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * FOR-RELEASE (New features): max-image-size implemented.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 91b27e0d0b0..967b0123c3f 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -27,9 +27,7 @@ face name prefixes should be in it for good results.
 
 * NEW FEATURES
 
-** Rework how the fringe "angle" bitmap at at bottom of buffer is
-shown to include an indication of whether the last line has a NL or not.
-[Assigned to KFS]
+** Change .emacs.d/.emacs to .emacs.d/emacs.
 
 ** Rework how fringe bitmaps are defined and used.
 Currently, bitmap usage and bitmap appearence are "mixed-up" in a
@@ -48,6 +46,8 @@ invalid pointer from string_free_list.
 
 * BUGS
 
+** VC bug report from Peter Milliken on Sep 21 (emacs-pretest-bug).
+
 ** TCP server processes do not work on Windows.
 
 TCP/IP server processes created with `make-network-process' consume