# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1158635965 0
# Node ID b08f901b1d03bdad71c1d37d14c4bc03a6db98b8
# Parent  37ec6edfcc150cdec57851b6fd3ad9ad4574d246
*** empty log message ***

diff -r 37ec6edfcc15 -r b08f901b1d03 mac/ChangeLog
--- a/mac/ChangeLog	Tue Sep 19 03:19:05 2006 +0000
+++ b/mac/ChangeLog	Tue Sep 19 03:19:25 2006 +0000
@@ -1,3 +1,12 @@
+2006-09-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* INSTALL: Remove descriptions about experimental flags.
+
+	* inc/config.h: Sync with src/config.in.
+
+	* src/Emacs.r (M_APPLE): New define.
+	(MENU): Use it.
+
 2006-09-15  Jay Belanger  <belanger@truman.edu>
 
 	* COPYING: Replace "Library Public License" by "Lesser Public
diff -r 37ec6edfcc15 -r b08f901b1d03 src/ChangeLog
--- a/src/ChangeLog	Tue Sep 19 03:19:05 2006 +0000
+++ b/src/ChangeLog	Tue Sep 19 03:19:25 2006 +0000
@@ -1,3 +1,26 @@
+2006-09-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* emacs.c (shut_down_emacs) [!subprocesses]: Don't set
+	inhibit_sentinels.
+
+	* mac.c [!MAC_OSX] (select): Fix argument name.
+
+	* macmenu.c (enum mac_menu_kind, min_menu_id): New enumerator and
+	menu ID for Apple menu.
+	(menubar_selection_callback): Remove function.
+	(find_and_call_menu_selection): New function from xmenu.c.
+	(x_activate_menubar): Use it.
+	(set_frame_menubar): Don't use f->output_data.mac->menubar_active.
+
+	* macterm.c (menubar_selection_callback): Remove extern.
+	(M_APPLE): Change to 234.
+	(do_apple_menu) [!TARGET_API_MAC_CARBON]: Make non-static.
+	(do_menu_choice): Remove function.
+
+	* macterm.h (struct mac_output): Remove member menubar_active.
+	(do_menu_choice): Remove extern.
+	(do_apple_menu) [!TARGET_API_MAC_CARBON]: Add extern.
+
 2006-09-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xfns.c (syms_of_xfns): Rename x_gtk_show_chooser_help_text to