Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-289
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-290
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-291
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-292
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-293
   Update from CVS

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

2 files changed, 6 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 08bef4585a7..c43f0697136 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-21  Chong Yidong  <cyd@mit.edu>
+
+        * FOR-RELEASE: point-entered /point-left bug fixed.
+
 2006-05-12  Eli Zaretskii  <eliz@gnu.org>
 
         * FOR-RELEASE: Spell-checking the manuals is now done; remove the
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 5d634762d9d..a02eb6821f1 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -29,12 +29,11 @@ and KDE projects, to use the new Emacs icons in etc/images/icons.
 ** We need a way a Lisp file encoded in iso-2022 can assure
 reliable decoding regardless of user options.
 
+** Clean up MUSTBENEW in Fcopy_file.
+
 ** JD Smith's 17 Apr 2006 bug report that CVS operations
 get mysterious unreproducible failures.
 
-** David Hansen's bug report on 16 Apr 2006 about point-entered and
-point-left text properties.
-
 ** Is there a basic problem with cl-byte-compile-compiler-macro?
 
 ** Markus Gritsch's report about Emacs looping on Windoze with the following