*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f54927b6133da9d757a62890881c8bd302fedd0..b6004bbdc4c59b19590b0979673fbc67ce207373 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2000-07-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * eshell/eshell.el (eshell): Replace links to eshell.info with
+       links to eshell, to avoid problems on systems where the manual is
+       installed as `eshell'.
+       * eshell/esh-cmd.el (eshell-cmd): Ditto.
+       * eshell/em-smart.el (eshell-smart): Ditto.
+       * eshell/em-banner.el (eshell-banner): Ditto.
+       * eshell/em-alias.el (eshell-alias, eshell-bad-command-tolerance):
+       Ditto.
+
+       * eshell/em-unix.el (eshell-shuffle-files): Don't disable
+       same-file check in the MS-DOS version (it does support inodes).
+
+       * eshell/em-alias.el (eshell-maybe-replace-by-alias): Doc fix.
+
+       * eshell/eshell.el (eshell-directory-name): Run default directory
+       name through convert-standard-filename.
+
 2000-07-18  Kenichi Handa  <handa@etl.go.jp>
 
        * international/mule-cmds.el (select-safe-coding-system): Fix typo
@@ -14,7 +33,7 @@
        New variable.
        (kkc-update-conversion): Run functions in it at the tail.
 
-2000-07-16  John Wiegley  <johnw@gnu.org.
+2000-07-16  John Wiegley  <johnw@gnu.org>
 
        * lisp/align.el (align-newline-and-indent): Adding new function
        for auto-aligning blocks of code on RET.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 5e908e88ac90dbbb621b2b6f6981cdabea8b27ab..4f075830ab9d687f745934b95d568b15812be466 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * sed1v2.inp: Put getloadavg.o into LIBOBJS, not GETLOADAVG_LIBS.
+
 2000-07-09  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * sed1v2.inp: Set LIBSOUND to an empty string.