/[emacs]/emacs/src/macfns.c
ViewVC logotype

Diff of /emacs/src/macfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.55 by mituharu, Wed Apr 6 02:24:23 2005 UTC revision 1.56 by mituharu, Thu Apr 14 09:25:41 2005 UTC
# Line 1895  x_set_name (f, name, explicit) Line 1895  x_set_name (f, name, explicit)
1895  #if TARGET_API_MAC_CARBON  #if TARGET_API_MAC_CARBON
1896          name = ENCODE_UTF_8 (name);          name = ENCODE_UTF_8 (name);
1897  #else  #else
1898          return;          name = ENCODE_SYSTEM (name);
1899  #endif  #endif
1900    
1901        BLOCK_INPUT;        BLOCK_INPUT;
# Line 1977  x_set_title (f, name, old_name) Line 1977  x_set_title (f, name, old_name)
1977  #if TARGET_API_MAC_CARBON  #if TARGET_API_MAC_CARBON
1978          name = ENCODE_UTF_8 (name);          name = ENCODE_UTF_8 (name);
1979  #else  #else
1980          return;          name = ENCODE_SYSTEM (name);
1981  #endif  #endif
1982    
1983        BLOCK_INPUT;        BLOCK_INPUT;
# Line 3637  x_create_tip_frame (dpyinfo, parms, text Line 3637  x_create_tip_frame (dpyinfo, parms, text
3637    
3638    check_mac ();    check_mac ();
3639    
   /* Use this general default value to start with until we know if  
      this frame has a specified name.  */  
   Vx_resource_name = Vinvocation_name;  
3640    
3641  #ifdef MULTI_KBOARD  #ifdef MULTI_KBOARD
3642    kb = dpyinfo->kboard;    kb = dpyinfo->kboard;
# Line 3653  x_create_tip_frame (dpyinfo, parms, text Line 3650  x_create_tip_frame (dpyinfo, parms, text
3650        && !EQ (name, Qunbound)        && !EQ (name, Qunbound)
3651        && !NILP (name))        && !NILP (name))
3652      error ("Invalid frame name--not a string or nil");      error ("Invalid frame name--not a string or nil");
   Vx_resource_name = name;  
3653    
3654    frame = Qnil;    frame = Qnil;
3655    GCPRO3 (parms, name, frame);    GCPRO3 (parms, name, frame);
# Line 4362  If ONLY-DIR-P is non-nil, the user can o Line 4358  If ONLY-DIR-P is non-nil, the user can o
4358                    filename[len++] = '/';                    filename[len++] = '/';
4359                  CFStringGetCString(reply.saveFileName, filename+len,                  CFStringGetCString(reply.saveFileName, filename+len,
4360                                     sizeof (filename) - len,                                     sizeof (filename) - len,
4361                                     kCFStringEncodingUTF8);  #if MAC_OSX
4362                                       kCFStringEncodingUTF8
4363    #else
4364                                       CFStringGetSystemEncoding ()
4365    #endif
4366                                       );
4367                }                }
4368              file = DECODE_FILE (make_unibyte_string (filename,              file = DECODE_FILE (make_unibyte_string (filename,
4369                                                       strlen (filename)));                                                       strlen (filename)));

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26