*** empty log message ***

3 files changed, 52 insertions, 0 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index ce878fc173f..c28608068ba 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -14,6 +14,8 @@ has to be set to nil: when t, it can leak memory and cause other problems.
 ** Check for widow and orphan lines in manuals;
 make sure all the pages really look ok in the manual as formatted.
 
+** Update facemenu-unlisted-faces, adding whatever other
+face name prefixes should be in it for good results.
 
 * NEW FEATURES
 
@@ -43,6 +45,36 @@ invalid pointer from string_free_list.
 
 * BUGS
 
+** Bug in ebrowse
+
+Date: Fri, 27 May 2005 17:35:48 +0200
+From: Markus Gritsch <gritsch@iue.tuwien.ac.at>
+
+the C++ header file which led to the problematic BROWSE file reads
+
+namespace test {
+     class Base
+     {
+     };
+
+     class B : public Base
+     {
+     };
+}
+
+class A : public test::Base
+{
+};
+
+The *Tree* is then displayed as
+
+   *Globals*
+   test
+   test::Base
+     test::B
+
+The class A seems to be missing.
+
 ** Ange-ftp should ignore irrelevant IPv6 errors:
 
 Message-Id: <4121-Tue23Mar2004165249+0100-piet@cs.uu.nl>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d879823f8a..3880d41e925 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-25  Richard M. Stallman  <rms@gnu.org>
 
+        * facemenu.el (facemenu-enable-faces-p): New function.
+        (facemenu-background-menu, facemenu-foreground-menu)
+        (facemenu-face-menu): Add menu-enable property.
+
         * jka-compr.el (jka-compr-insert-file-contents):
         Special handling if cannot find the uncompression program.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 17917b159e3..046d1a321fe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,21 @@
 2005-06-25  Richard M. Stallman  <rms@gnu.org>
 
+        * macfns.c (Fx_show_tip): Pass new arg to try_window.
+
+        * w32fns.c (Fx_show_tip): Pass new arg to try_window.
+
+        * xfns.c (Fx_show_tip): Pass new arg to try_window.
+
+        * xdisp.c (try_window): New arg CHECK_MARGINS.  Calls changed.
+        (redisplay_window): Handle try_window reporting point in scroll margin.
+
+        * dispextern.h (try_window): Declare new arg.
+
+        * fileio.c (Fcopy_file): New arg PRESERVE_UID_GID.
+        Use fchmod to copy the file modes.
+        (Frename_file): Don't copy UID and GID here;
+        instead, specify t for PRESERVE_UID_GID when calling Fcopy_file.
+
         * eval.c (call_debugger): Take full care of extending stack limits
         to make space for the debugger, and restore the change afterward.
         Bind debug-on-error to nil.