*** empty log message ***

2 files changed, 7 insertions, 0 deletions

diff --git a/etc/TODO b/etc/TODO
index 757e040562a..ea027d8c5ec 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -9,6 +9,10 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
+** In C-x d, the default if you type RET should be the directory name,
+but if you type M-n you should get the visited file name of the
+current buffer.
+
 ** whitespace-cleanup should work only on the region if the region is active.
 
 ** Distribute a bar cursor of width > 1 evenly between the two glyphs
diff --git a/src/ChangeLog b/src/ChangeLog
index c2fdb389729..8781aacc368 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -18,6 +18,9 @@
 
 2006-05-21  Richard Stallman  <rms@gnu.org>
 
+        * xfaces.c (best_matching_font): Abort for best == NULL
+        before we start to use it.
+
         * buffer.c (syms_of_buffer, Fmake_overlay): Doc fixes.
 
 2006-05-20  Kim F. Storm  <storm@cua.dk>