*** empty log message ***

2 files changed, 27 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80a16562531..bad33809925 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-05  Richard M. Stallman  <rms@gnu.org>
 
+        * international/mule-cmds.el (select-safe-coding-system): Check for
+        non-nil CODING-SYSTEM before warning it disagrees with AUTO-CS.
+
         * net/ange-ftp.el (ange-ftp-smart-gateway): Doc fix.
 
 2002-08-05  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/ChangeLog b/src/ChangeLog
index d7b616e2868..13bfdd83f22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2002-08-01  David Ponce  <david@dponce.com>
+
+        * w32menu.c (local_heap, local_alloc, local_free): New macros.
+        (malloc_widget_value, free_widget_value)
+        (w32_free_submenu_strings): Use them.
+
+        (push_submenu_start, push_submenu_end, push_left_right_boundary)
+        (push_menu_pane, push_menu_item, single_keymap_panes)
+        (single_menu_item, Fx_popup_menu, menubar_selection_callback)
+        (single_submenu, set_frame_menubar)
+        (w32_menu_show, w32_dialog_show): Use AREF, ASET, ASIZE.
+
+        (Fx_popup_menu):  Don't show pop up menu until preceding one is
+        actually cleaned up.  Moved UNGCPRO outside #ifdef HAVE_MENUS block.
+
+        * w32menu.c: Changes adapted from xmenu.c
+        (set_frame_menubar): First parse all submenus,
+        then make widget_value trees from them.
+        Don't allocate any widget_value objects
+        until we are done with the parsing.
+        (parse_single_submenu): New function.
+        (digest_single_submenu): New function.
+        (single_submenu): Function deleted, replaced by those two.
+
 2002-08-04  Andrew Choi  <akochoi@shaw.ca>
 
         * macterm.c (XTread_socket): Check that FrontNonFloatingWindow