*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a48c1da393e0b97836ad799e8da4a10edfdbae59..6b7c407c292bf504d9c9d191ab6135684c9b9321 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2000-07-05  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * emacs-lisp/easymenu.el (easy-menu-define): Docstring fix.
+       (easy-menu-do-define): Use `menu-item' format.
+       Handle case where easy-menu-create-menu returns a symbol.
+       Manually call the potential top-level filter in the function binding.
+       (easy-menu-filter-return): New arg NAME.
+       Convert to a keymap if MENU is an XEmacs menu.
+       (easy-menu-convert-item-1): New.  Extracted from easy-menu-do-add-item.
+       (easy-menu-converted-items-table, easy-menu-convert-item):
+       New var and fun to memoize easy-menu-convert-item-1.
+       (easy-menu-do-add-item): Use it.
+       (easy-menu-create-menu): Use easy-menu-convert-item.
+       Wrap easy-menu-filter-return around any :filter specification.
+       Don't convert the menu if a filter was specified.
+       Tell easy-menu-make-symbol not to check for MENU being an expression.
+       (easy-menu-make-symbol): New arg NOEXP.
+
 2000-07-05  Gerd Moellmann  <gerd@gnu.org>
 
        * emacs-lisp/lisp-mode.el (eval-defun-2): Remove parameter

diff --git a/src/ChangeLog b/src/ChangeLog
index 89af37f2cb27618cd7c301c5da6c3a1b0a4182fe..35d04987a6ee1f7b80f43af671e267a803c23ba4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2000-07-05  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * w32menu.c (w32_menu_display_help):
+       * xmenu.c (menu_help_callback): Use show_help_echo.
+
+       * keyboard.h (show_help_echo): Declare.
+
+       * keyboard.c (show_help_echo): New function, extracted from read_char.
+       Feval its `msg' argument if it's a cons cell.
+       (read_char): Use it.
+
+       * xterm.c (note_mode_line_highlight, note_mouse_highlight) 
+       (note_tool_bar_highlight, XTread_socket):
+       * msdos.c (IT_note_mode_line_highlight, IT_note_mouse_highlight) 
+       (dos_rawgetc):
+       * w32term.c (note_mode_line_highlight, note_mouse_highlight)
+       (note_tool_bar_highlight, w32_read_socket):
+       Do not gratuitously ignore non-string `help-echo' properties.
+
 2000-07-05  Gerd Moellmann  <gerd@gnu.org>
 
        * eval.c (Feval): Put check for interrupt_input_block in #if 0.