# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 963301134 0
# Node ID 746a90123971987224a91b866ddccc63bf4bcbe2
# Parent  e75b1b3a94f49a15fa138daf3d3f3f8ed6ea2995
*** empty log message ***

diff -r e75b1b3a94f4 -r 746a90123971 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 11 07:36:21 2000 +0000
+++ b/lisp/ChangeLog	Tue Jul 11 07:38:54 2000 +0000
@@ -1,3 +1,8 @@
+2000-07-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* eshell/esh-module.el (toplevel): Reference
+	byte-compile-current-file only if it is bound.
+
 2000-07-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* dired.el: Don't require `dired-aux'.
diff -r e75b1b3a94f4 -r 746a90123971 src/ChangeLog
--- a/src/ChangeLog	Tue Jul 11 07:36:21 2000 +0000
+++ b/src/ChangeLog	Tue Jul 11 07:38:54 2000 +0000
@@ -1,3 +1,16 @@
+2000-07-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* keyboard.c (show_help_echo): Accept additional parameter
+	ok_to_overwrite_keystroke_echo.
+	(read_char): Call show_help_echo with a zero
+	ok_to_overwrite_keystroke_echo argument.
+	* keyboard.h (show_help_echo): Update prototype of
+	show_help_echo.
+	* xmenu.c (menu_help_callback): Call show_help_echo with non-zero
+	ok_to_overwrite_keystroke_echo argument.
+	* w32menu.c (w32_menu_display_help): Call show_help_echo with
+	non-zero ok_to_overwrite_keystroke_echo argument.
+
 2000-07-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* xdisp.c (try_window_id): If changes are all below what is