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

[Miles Bader]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.24.4.6 emacs/src/macfns.c:1.24.4.7
*** emacs/src/macfns.c:1.24.4.6 Thu Nov  4 08:55:33 2004
--- emacs/src/macfns.c  Wed Dec  8 05:02:21 2004
***************
*** 1932,1939 ****
        {
  #if TARGET_API_MAC_CARBON
        CFStringRef windowTitle =
!         CFStringCreateWithCString (NULL, SDATA (name),
!                                    kCFStringEncodingUTF8);
  
        SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
        CFRelease (windowTitle);
--- 1932,1938 ----
        {
  #if TARGET_API_MAC_CARBON
        CFStringRef windowTitle =
!         cfstring_create_with_utf8_cstring (SDATA (name));
  
        SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
        CFRelease (windowTitle);
***************
*** 2015,2022 ****
        {
  #if TARGET_API_MAC_CARBON
        CFStringRef windowTitle =
!         CFStringCreateWithCString (NULL, SDATA (name),
!                                    kCFStringEncodingUTF8);
  
        SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
        CFRelease (windowTitle);
--- 2014,2020 ----
        {
  #if TARGET_API_MAC_CARBON
        CFStringRef windowTitle =
!         cfstring_create_with_utf8_cstring (SDATA (name));
  
        SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
        CFRelease (windowTitle);
***************
*** 4246,4253 ****
      NavDialogRef dialogRef;
      NavTypeListHandle fileTypes = NULL;
      NavUserAction userAction;
!     CFStringRef message=NULL, client=NULL, saveName = NULL, ok = NULL;
!     CFStringRef title = NULL;
      
      BLOCK_INPUT;
      /* No need for a callback function because we are modal */
--- 4244,4250 ----
      NavDialogRef dialogRef;
      NavTypeListHandle fileTypes = NULL;
      NavUserAction userAction;
!     CFStringRef message=NULL, saveName = NULL;
      
      BLOCK_INPUT;
      /* No need for a callback function because we are modal */
***************
*** 4259,4273 ****
      options.optionFlags |= kNavSelectAllReadableItem;
      if (!NILP(prompt))
        {
!       message = CFStringCreateWithCStringNoCopy(NULL, SDATA(prompt),
!                                                 kCFStringEncodingUTF8, 
!                                                 kCFAllocatorNull);
        options.message = message;
        }
      /* Don't set the application, let it use default.
!     client = CFStringCreateWithCStringNoCopy(NULL, "Emacs", 
!                                            kCFStringEncodingMacRoman, NULL);
!     options.clientName = client;
      */
  
      if (!NILP (only_dir_p))
--- 4256,4266 ----
      options.optionFlags |= kNavSelectAllReadableItem;
      if (!NILP(prompt))
        {
!       message = cfstring_create_with_utf8_cstring (SDATA (prompt));
        options.message = message;
        }
      /* Don't set the application, let it use default.
!     options.clientName = CFSTR ("Emacs");
      */
  
      if (!NILP (only_dir_p))
***************
*** 4276,4292 ****
      else if (NILP (mustmatch)) 
        { 
        /* This is a save dialog */
-       ok = CFStringCreateWithCString (NULL, "Ok", kCFStringEncodingUTF8);
-       title = CFStringCreateWithCString (NULL, "Enter name",
-                                          kCFStringEncodingUTF8);
        options.optionFlags |= kNavDontConfirmReplacement;
!       options.actionButtonLabel = ok;
!       options.windowTitle = title;
  
        if (!NILP(default_filename))
          {
!           saveName = CFStringCreateWithCString(NULL, SDATA(default_filename),
!                                                kCFStringEncodingUTF8);
            options.saveFileName = saveName;
            options.optionFlags |= kNavSelectDefaultLocation;
          }
--- 4269,4282 ----
      else if (NILP (mustmatch)) 
        { 
        /* This is a save dialog */
        options.optionFlags |= kNavDontConfirmReplacement;
!       options.actionButtonLabel = CFSTR ("Ok");
!       options.windowTitle = CFSTR ("Enter name");
  
        if (!NILP(default_filename))
          {
!           saveName =
!             cfstring_create_with_utf8_cstring (SDATA (default_filename));
            options.saveFileName = saveName;
            options.optionFlags |= kNavSelectDefaultLocation;
          }
***************
*** 4320,4329 ****
      }
  
      if (saveName) CFRelease(saveName);
-     if (client) CFRelease(client);
      if (message) CFRelease(message);
-     if (ok) CFRelease(ok);
-     if (title) CFRelease(title);
  
      if (status == noErr) {
        userAction = NavDialogGetUserAction(dialogRef);
--- 4310,4316 ----
***************
*** 4415,4422 ****
    0, /* MAC_TODO: x_set_scroll_bar_background, */
    x_set_screen_gamma,
    x_set_line_spacing,
!   0, /* MAC_TODO: x_set_fringe_width, */
!   0, /* MAC_TODO: x_set_fringe_width, */
    0, /* x_set_wait_for_wm, */
    0, /* MAC_TODO: x_set_fullscreen, */
  };
--- 4402,4409 ----
    0, /* MAC_TODO: x_set_scroll_bar_background, */
    x_set_screen_gamma,
    x_set_line_spacing,
!   x_set_fringe_width,
!   x_set_fringe_width,
    0, /* x_set_wait_for_wm, */
    0, /* MAC_TODO: x_set_fullscreen, */
  };