From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 19 Sep 2006 03:19:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~462
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61973eb68dd58e5e91ae91204fe36323c95adc4a;p=emacs.git

*** empty log message ***
---

diff --git a/mac/ChangeLog b/mac/ChangeLog
index e6423384037..914874c6cc1 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index db2002ed507..17258fff1b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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