[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macfns.c
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/src/macfns.c |
Date: |
Thu, 23 Jun 2005 12:12:25 -0400 |
Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.60 emacs/src/macfns.c:1.61
*** emacs/src/macfns.c:1.60 Fri Jun 10 23:02:56 2005
--- emacs/src/macfns.c Thu Jun 23 16:12:25 2005
***************
*** 208,214 ****
CHECK_LIVE_FRAME (frame);
f = XFRAME (frame);
if (! FRAME_MAC_P (f))
! error ("non-mac frame used");
return f;
}
--- 208,214 ----
CHECK_LIVE_FRAME (frame);
f = XFRAME (frame);
if (! FRAME_MAC_P (f))
! error ("Non-Mac frame used");
return f;
}
***************
*** 4241,4247 ****
NavTypeListHandle fileTypes = NULL;
NavUserAction userAction;
CFStringRef message=NULL, saveName = NULL;
!
BLOCK_INPUT;
/* No need for a callback function because we are modal */
NavGetDefaultDialogCreationOptions(&options);
--- 4241,4247 ----
NavTypeListHandle fileTypes = NULL;
NavUserAction userAction;
CFStringRef message=NULL, saveName = NULL;
!
BLOCK_INPUT;
/* No need for a callback function because we are modal */
NavGetDefaultDialogCreationOptions(&options);
***************
*** 4265,4272 ****
if (!NILP (only_dir_p))
status = NavCreateChooseFolderDialog(&options,
mac_nav_event_callbackUPP,
NULL, NULL, &dialogRef);
! else if (NILP (mustmatch))
! {
/* This is a save dialog */
options.optionFlags |= kNavDontConfirmReplacement;
options.actionButtonLabel = CFSTR ("Ok");
--- 4265,4272 ----
if (!NILP (only_dir_p))
status = NavCreateChooseFolderDialog(&options,
mac_nav_event_callbackUPP,
NULL, NULL, &dialogRef);
! else if (NILP (mustmatch))
! {
/* This is a save dialog */
options.optionFlags |= kNavDontConfirmReplacement;
options.actionButtonLabel = CFSTR ("Ok");
***************
*** 4283,4289 ****
options.saveFileName = saveName;
options.optionFlags |= kNavSelectDefaultLocation;
}
! status = NavCreatePutFileDialog(&options,
'TEXT', kNavGenericSignature,
mac_nav_event_callbackUPP, NULL,
&dialogRef);
--- 4283,4289 ----
options.saveFileName = saveName;
options.optionFlags |= kNavSelectDefaultLocation;
}
! status = NavCreatePutFileDialog(&options,
'TEXT', kNavGenericSignature,
mac_nav_event_callbackUPP, NULL,
&dialogRef);
***************
*** 4295,4301 ****
mac_nav_event_callbackUPP, NULL,
NULL, NULL, &dialogRef);
}
!
/* Set the default location and continue*/
if (status == noErr)
{
--- 4295,4301 ----
mac_nav_event_callbackUPP, NULL,
NULL, NULL, &dialogRef);
}
!
/* Set the default location and continue*/
if (status == noErr)
{
***************
*** 4307,4313 ****
FSSpec defLoc;
status = posix_pathname_to_fsspec (SDATA (ENCODE_FILE (dir)), &defLoc);
#endif
! if (status == noErr)
{
#ifdef MAC_OSX
AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
--- 4307,4313 ----
FSSpec defLoc;
status = posix_pathname_to_fsspec (SDATA (ENCODE_FILE (dir)), &defLoc);
#endif
! if (status == noErr)
{
#ifdef MAC_OSX
AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
***************
*** 4359,4365 ****
int len = strlen(filename);
if (len && filename[len-1] != '/')
filename[len++] = '/';
! CFStringGetCString(reply.saveFileName, filename+len,
sizeof (filename) - len,
#if MAC_OSX
kCFStringEncodingUTF8
--- 4359,4365 ----
int len = strlen(filename);
if (len && filename[len-1] != '/')
filename[len++] = '/';
! CFStringGetCString(reply.saveFileName, filename+len,
sizeof (filename) - len,
#if MAC_OSX
kCFStringEncodingUTF8
***************
*** 4387,4397 ****
}
UNGCPRO;
!
/* Make "Cancel" equivalent to C-g. */
if (NILP (file))
Fsignal (Qquit, Qnil);
!
return unbind_to (count, file);
}
--- 4387,4397 ----
}
UNGCPRO;
!
/* Make "Cancel" equivalent to C-g. */
if (NILP (file))
Fsignal (Qquit, Qnil);
!
return unbind_to (count, file);
}