*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2f95231c07c5de8ef74025cbaa1372114480f8..f18c8cb14d24673b24f909ef37cc229ee57d2d06 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-28  Richard M. Stallman  <rms@gnu.org>
+
+       * simple.el: Don't require cl.
+
 2002-07-25  Dave Love  <fx@gnu.org>
 
        * obsolete/c-mode.el: Deleted.

diff --git a/src/ChangeLog b/src/ChangeLog
index 202f0e7e3cdd01339bc082c7340dff2429059004..a09b7caae409c6df75e619d430d709ab106f4cd2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-28  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * fileio.c (Fexpand_file_name) [DOS_NT]: Use the root directory
+       of the current drive as the fallback for default_directory.
+
+       * w32.c (emacs_root_dir): New function.
+
+       * msdos.c (emacs_root_dir): New function.
+
 2002-07-23  Kenichi Handa  <handa@etl.go.jp>
 
        * xdisp.c (face_before_or_after_it_pos): Call
@@ -68,6 +77,7 @@
 
        * window.c (Fset_window_hscroll): Doc fix.
 
+>>>>>>> 1.1914.2.171
 2002-05-31  Gerd Moellmann  <gerd@gnu.org>
 
        * xterm.c (x_get_char_face_and_encoding): Add parameter DISPLAY_P.