*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9eb7741a7cd0caa31ce377a50c08c4d34906398b..194dbb353999aab00cb696760700d8d3dbad71d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index ac724f926f144fa448eff635f697e00874616220..73c225c3b3254fbb0a6bed86f363da7f4f200ab5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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