2 files changed, 12 insertions, 0 deletions

diff --git a/etc/TODO b/etc/TODO
index 7db5d3aee89..b83d303e3cf 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -82,6 +82,12 @@ to the FSF.
   to save their changes. If the user says yes, show them
   in a Custom buffer using customize-customized.
 
+** Emacs Lisp mode could put an overlay on the defun for every
+  function that has advice.  The overlay could have `after-text' like "
+  [Function has advice]".  It might look like
+     (defun foo [Function has advice] (x y) 
+  The overlay could also be a button that you could use to view the advice.
+
 ** ange-ftp
 *** understand sftp
 *** Use MLS for ange-ftp-insert-directory if a list of files is specified.
diff --git a/src/ChangeLog b/src/ChangeLog
index 3a0bceb6701..fa746e63b2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-11  Richard M. Stallman  <rms@gnu.org>
+
+        * fileio.c (Frename_file, Fadd_name_to_file)
+        (Fmake_symbolic_link): If NEWNAME or LINKNAME is a directory,
+        expand the basename of FILE relative to it.
+
 2005-03-11  Kenichi Handa  <handa@m17n.org>
 
         * fileio.c (Finsert_file_contents): Call Fcheck_coding_system