[Emacs-diffs] Changes to emacs/src/macfns.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.55 emacs/src/macfns.c:1.56
*** emacs/src/macfns.c:1.55     Wed Apr  6 02:24:23 2005
--- emacs/src/macfns.c  Thu Apr 14 09:25:41 2005
***************
*** 1895,1901 ****
  #if TARGET_API_MAC_CARBON
        name = ENCODE_UTF_8 (name);
  #else
!         return;
  #endif
  
        BLOCK_INPUT;
--- 1895,1901 ----
  #if TARGET_API_MAC_CARBON
        name = ENCODE_UTF_8 (name);
  #else
!       name = ENCODE_SYSTEM (name);
  #endif
  
        BLOCK_INPUT;
***************
*** 1977,1983 ****
  #if TARGET_API_MAC_CARBON
        name = ENCODE_UTF_8 (name);
  #else
!         return;
  #endif
  
        BLOCK_INPUT;
--- 1977,1983 ----
  #if TARGET_API_MAC_CARBON
        name = ENCODE_UTF_8 (name);
  #else
!       name = ENCODE_SYSTEM (name);
  #endif
  
        BLOCK_INPUT;
***************
*** 3637,3645 ****
  
    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;
--- 3637,3642 ----
***************
*** 3653,3659 ****
        && !EQ (name, Qunbound)
        && !NILP (name))
      error ("Invalid frame name--not a string or nil");
-   Vx_resource_name = name;
  
    frame = Qnil;
    GCPRO3 (parms, name, frame);
--- 3650,3655 ----
***************
*** 4362,4368 ****
                  filename[len++] = '/';
                CFStringGetCString(reply.saveFileName, filename+len, 
                                   sizeof (filename) - len,
!                                  kCFStringEncodingUTF8);
              }
            file = DECODE_FILE (make_unibyte_string (filename,
                                                     strlen (filename)));
--- 4358,4369 ----
                  filename[len++] = '/';
                CFStringGetCString(reply.saveFileName, filename+len, 
                                   sizeof (filename) - len,
! #if MAC_OSX
!                                  kCFStringEncodingUTF8
! #else
!                                  CFStringGetSystemEncoding ()
! #endif
!                                  );
              }
            file = DECODE_FILE (make_unibyte_string (filename,
                                                     strlen (filename)));