From: Pavel Janík <Pavel@Janik.cz>
Date: Sat, 16 Feb 2002 09:53:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~16638
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5d2200aa40df1fde2907217493f51a23ed2649c9;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d483854bd4..86cd8fce6e7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,38 @@
+2002-02-16  Pavel Jan,Bm(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 d65ca3dfd9e..2fbe90fb1ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-16  Pavel Jan,Bm(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.