# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1113470741 0
# Node ID 217c5fe404c075a8d84a945d387d3e109be760f5
# Parent  72c95a1c84c62a59ea0d635b0c0f80a0d93f3858
(x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]: Use ENCODE_SYSTEM
to encode title bar string.
(x_create_tip_frame): Apply 2005-03-18 change for xfns.c.
(Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]: Use
CFStringGetSystemEncoding to get system default string encoding.

diff -r 72c95a1c84c6 -r 217c5fe404c0 src/macfns.c
--- a/src/macfns.c	Thu Apr 14 09:25:01 2005 +0000
+++ b/src/macfns.c	Thu Apr 14 09:25:41 2005 +0000
@@ -1895,7 +1895,7 @@
 #if TARGET_API_MAC_CARBON
 	name = ENCODE_UTF_8 (name);
 #else
-        return;
+	name = ENCODE_SYSTEM (name);
 #endif
 
       BLOCK_INPUT;
@@ -1977,7 +1977,7 @@
 #if TARGET_API_MAC_CARBON
 	name = ENCODE_UTF_8 (name);
 #else
-        return;
+	name = ENCODE_SYSTEM (name);
 #endif
 
       BLOCK_INPUT;
@@ -3637,9 +3637,6 @@
 
   check_mac ();
 
-  /* Use this general default value to start with until we know if
-     this frame has a specified name.  */
-  Vx_resource_name = Vinvocation_name;
 
 #ifdef MULTI_KBOARD
   kb = dpyinfo->kboard;
@@ -3653,7 +3650,6 @@
       && !EQ (name, Qunbound)
       && !NILP (name))
     error ("Invalid frame name--not a string or nil");
-  Vx_resource_name = name;
 
   frame = Qnil;
   GCPRO3 (parms, name, frame);
@@ -4362,7 +4358,12 @@
 		  filename[len++] = '/';
 		CFStringGetCString(reply.saveFileName, filename+len, 
 				   sizeof (filename) - len,
-				   kCFStringEncodingUTF8);
+#if MAC_OSX
+				   kCFStringEncodingUTF8
+#else
+				   CFStringGetSystemEncoding ()
+#endif
+				   );
 	      }
 	    file = DECODE_FILE (make_unibyte_string (filename,
 						     strlen (filename)));