# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1110960647 0
# Node ID 6c6ad6cc2f5e8f814c1dff0d8f931e04103a83ac
# Parent  338b5a42b1f4b7afd94439e9c233ae36211057e3
*** empty log message ***

diff -r 338b5a42b1f4 -r 6c6ad6cc2f5e mac/ChangeLog
--- a/mac/ChangeLog	Wed Mar 16 08:10:12 2005 +0000
+++ b/mac/ChangeLog	Wed Mar 16 08:10:47 2005 +0000
@@ -1,14 +1,19 @@
+2005-03-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* Emacs.app/Contents/Info.plist (CFBundleIdentifier): Change to
+	org.gnu.Emacs.
+
 2005-03-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* INSTALL: Mention new target `NonCarbon'.
-	
+
 2005-03-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* makefile.MPW (NonCarbon): New target.  The target `Emacs' is now
 	used for the Carbon build that defines HAVE_CARBON.
 
 	* inc/config.h (HAVE_STDLIB_H): Define to 1.
-	
+
 	* src/EmacsMPW.r (SIZE): Increase preferred memory size to 32MB.
 	[HAVE_CARBON] (crfg): New resource for extra stack space.
 
diff -r 338b5a42b1f4 -r 6c6ad6cc2f5e src/ChangeLog
--- a/src/ChangeLog	Wed Mar 16 08:10:12 2005 +0000
+++ b/src/ChangeLog	Wed Mar 16 08:10:47 2005 +0000
@@ -1,3 +1,50 @@
+2005-03-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* mac.c: Include macterm.h instead of directly including Carbon.h.
+	[TARGET_API_MAC_CARBON] (Qstring, Qnumber, Qboolean, Qdate, Qdata)
+	(Qarray, Qdictionary): New variables.
+	(syms_of_mac) [TARGET_API_MAC_CARBON]: Initialize them.
+	[TARGET_API_MAC_CARBON] (Qutf_8): Add extern.
+	[TARGET_API_MAC_CARBON] (DECODE_UTF_8): New macro.
+	[TARGET_API_MAC_CARBON] (struct cfdict_context): New struct used
+	in callback for CFDictionaryApplyFunction.
+	[TARGET_API_MAC_CARBON] (cfdata_to_lisp, cfstring_to_lisp)
+	(cfnumber_to_lisp, cfdate_to_lisp, cfboolean_to_lisp)
+	(cfobject_desc_to_lisp, cfdictionary_add_to_list)
+	(cfdictionary_puthash, cfproperty_list_to_lisp): New functions.
+	[TARGET_API_MAC_CARBON] (Fmac_get_preference): New function.
+	(syms_of_mac) [TARGET_API_MAC_CARBON]: Defsubr it.
+	(P, LOOSE_BINDING, SINGLE_COMPONENT, HASHKEY_TERMINAL): New macro.
+	(skip_while_space, parse_comment, parse_include_file)
+	(parse_binding, parse_component, parse_resource_name, parse_value)
+	(parse_resource_line, xrm_create_database, xrm_q_put_resource)
+	(xrm_merge_string_database, xrm_q_get_resource, xrm_get_resource)
+	(xrm_cfproperty_list_to_value, xrm_get_preference_database): New
+	functions.
+
+	* macfns.c (mac_get_rdb_resource): Remove function.
+	(x_get_string_resource): Use xrm_get_resource.
+
+	* macgui.h (XrmDatabase): Typedef to Lisp_Object.
+
+	* macterm.c (x_list_fonts): FONT-LIST-CACHE is now cadr part of
+	name_list_element.
+	(mac_make_rdb): Create resource database from preferences and
+	argument string.
+	(mac_term_init): Save resource database to cddr part of
+	name_list_element.
+
+	* macterm.h (xrm_merge_string_database, xrm_get_resource)
+	(xrm_get_preference_database): Add externs.
+	[TARGET_API_MAC_CARBON] (cfdata_to_lisp, cfstring_to_lisp)
+	(cfnumber_to_lisp, cfdate_to_lisp, cfboolean_to_lisp)
+	(cfobject_desc_to_lisp, cfproperty_list_to_lisp): Likewise.
+
+	* process.c (init_process): Change `#ifdef DARWIN' to `#if
+	defined (DARWIN) || defined (MAC_OSX)'
+
+	* s/darwin.h (DARWIN): Don't define.
+
 2005-03-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macfns.c (Qhyper, Qsuper, Qmeta, Qalt, Qctrl, Qcontrol, Qshift):
@@ -7,7 +54,7 @@
 	Vx_window_horizontal_drag_shape.
 	(x_set_mouse_color): Change mouse pointer shape.
 	(mac_window) [!MAC_OSX]: Create root control.
-	(mac_window): Remove initializations of mouse pointer shapes.
+	(Fx_create_frame): Remove initializations of mouse pointer shapes.
 	(hourglass_started): New function (from xfns.c).
 	(start_hourglass, cancel_hourglass): Put function body in #ifdef
 	MAC_OSX.