*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d483854bd47622067d600b587fa151364018117..86cd8fce6e79813efc22c4ac8a9a47755a829512 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,38 @@
+2002-02-16  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+
+       * eshell/em-alias.el (eshell-alias-initialize): Do not use
+       make-local-hook.
+
+       * eshell/em-cmpl.el (eshell-cmpl-initialize): Likewise.
+
+       * eshell/em-dirs.el (eshell-dirs-initialize): Likewise.
+
+       * eshell/em-glob.el (eshell-glob-initialize): Likewise.
+
+       * eshell/em-hist.el (eshell-hist-initialize): Likewise.
+
+       * eshell/em-pred.el (eshell-pred-initialize): Likewise.
+
+       * eshell/em-prompt.el (eshell-prompt-initialize): Likewise.
+
+       * eshell/em-rebind.el (eshell-rebind-initialize): Likewise.
+
+       * eshell/em-smart.el (eshell-smart-initialize): Likewise.
+
+       * eshell/em-unix.el (eshell-unix-initialize): Likewise.
+
+       * eshell/esh-cmd.el (eshell-cmd-initialize): Likewise.
+
+       * eshell/esh-ext.el (eshell-ext-initialize): Likewise.
+
+       * eshell/esh-io.el (eshell-io-initialize): Likewise.
+
+       * eshell/esh-mode.el (eshell-mode): Likewise.
+
+       * eshell/esh-test.el (eshell-show-usage-metrics): Likewise.
+
+       * eshell/esh-var.el (eshell-var-initialize): Likewise.
+
 2002-02-16  John Wiegley  <johnw@gnu.org>
 
        * eshell/em-hist.el (eshell-hist-initialize): When in the
@@ -725,7 +760,6 @@
 
        * progmodes/perl-mode.el (perl-mode-abbrev-table): Restore definition.
 
->>>>>>> 1.3409
 2002-01-21  Richard M. Stallman  <rms@gnu.org>
 
        * emacs-lisp/copyright.el (copyright-regexp): Fix previous change.
@@ -918,7 +952,6 @@
        (eudc-display-mail): New function.
        (eudc-bob-play-sound-at-point): Remove XEmacs case.
 
->>>>>>> 1.3356
 2002-01-15  Richard M. Stallman  <rms@gnu.org>
 
        * emacs-lisp/autoload.el (make-autoload):
@@ -1758,7 +1791,6 @@
        * apropos.el (apropos-print): SPACING is now nil or a separator string.
        (apropos-documentation, apropos-value): Pass a suitable string.
 
->>>>>>> 1.3337
 2001-12-21  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * dired.el (dired-free-space-program, dired-free-space-args):

diff --git a/src/ChangeLog b/src/ChangeLog
index d65ca3dfd9e36bc35eb2d30ead8a6d5860e70034..2fbe90fb1ad9700d46cfb2edc1987db4354fe097 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-16  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+
+       * keyboard.c: Do not include "systime.h" twice.
+
 2002-02-15  Andreas Schwab  <schwab@suse.de>
 
        * puresize.h (BASE_PURESIZE): Increase to 9/5.