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

[Steven Tamm]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.40 emacs/src/macfns.c:1.41
*** emacs/src/macfns.c:1.40     Wed Oct  6 15:38:53 2004
--- emacs/src/macfns.c  Sun Oct 10 16:56:20 2004
***************
*** 4247,4252 ****
--- 4247,4253 ----
      NavUserAction userAction;
      CFStringRef message=NULL, client=NULL, saveName = NULL;
      
+     BLOCK_INPUT;
      /* No need for a callback function because we are modal */
      NavGetDefaultDialogCreationOptions(&options);
      options.modality = kWindowModalityAppModal;
***************
*** 4317,4325 ****
        AEDisposeDesc(&defLocAed);
        }
  
-       BLOCK_INPUT;
        status = NavDialogRun(dialogRef);
-       UNBLOCK_INPUT;
      }
  
      if (saveName) CFRelease(saveName);
--- 4318,4324 ----
***************
*** 4332,4340 ****
        {
        case kNavUserActionNone:
        case kNavUserActionCancel:
!         NavDialogDispose(dialogRef);
!         Fsignal (Qquit, Qnil);  /* Treat cancel like C-g */
!         return;
        case kNavUserActionOpen:
        case kNavUserActionChoose:
        case kNavUserActionSaveAs:
--- 4331,4337 ----
        {
        case kNavUserActionNone:
        case kNavUserActionCancel:
!         break;                /* Treat cancel like C-g */
        case kNavUserActionOpen:
        case kNavUserActionChoose:
        case kNavUserActionSaveAs:
***************
*** 4369,4374 ****
--- 4366,4372 ----
                               dir, mustmatch, dir, Qfile_name_history,
                               default_filename, Qnil);
      }
+     UNBLOCK_INPUT;
    }
  
    UNGCPRO;