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

[Andrew Choi]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.8 emacs/src/macterm.c:1.9
*** emacs/src/macterm.c:1.8     Tue Jun 18 01:33:25 2002
--- emacs/src/macterm.c Mon Jul  1 16:02:33 2002
***************
*** 12123,12142 ****
          int i;
          
          /* AE file list is one based so just use that for indexing here.  */
!         for (i = 1; (err == noErr) && (i <= num_files_to_open); i++) {
!           FSSpec fs;
!         Str255 path_name, unix_path_name;
! 
!           err = AEGetNthPtr(&the_desc, i, typeFSS, &keyword, &actual_type,
!                           (Ptr) &fs, sizeof (fs), &actual_size);
!           if (err != noErr) break;
! 
!         if (path_from_vol_dir_name (path_name, 255, fs.vRefNum, fs.parID,
!                                     fs.name) &&
!             mac_to_posix_pathname (path_name, unix_path_name, 255))
!             drag_and_drop_file_list = Fcons (build_string (unix_path_name),
!                                            drag_and_drop_file_list);
!         }
        }
    }
  
--- 12123,12153 ----
          int i;
          
          /* AE file list is one based so just use that for indexing here.  */
!         for (i = 1; (err == noErr) && (i <= num_files_to_open); i++)
!         {
!           FSSpec fs;
!           Str255 path_name, unix_path_name;
! #ifdef MAC_OSX
!           FSRef fref;
! #endif
! 
!           err = AEGetNthPtr(&the_desc, i, typeFSS, &keyword, &actual_type,
!                             (Ptr) &fs, sizeof (fs), &actual_size);
!           if (err != noErr) break;
! 
! #ifdef MAC_OSX
!           err = FSpMakeFSRef (&fs, &fref);
!           if (err != noErr) break;
! 
!           if (FSRefMakePath (&fref, unix_path_name, 255) == noErr)
! #else
!           if (path_from_vol_dir_name (path_name, 255, fs.vRefNum, fs.parID,
!                                       fs.name) &&
!               mac_to_posix_pathname (path_name, unix_path_name, 255))
! #endif
!             drag_and_drop_file_list = Fcons (build_string (unix_path_name),
!                                              drag_and_drop_file_list);
!         }
        }
    }
  
***************
*** 13142,13147 ****
--- 13153,13164 ----
  #endif
  
    mac_initialize_display_info ();
+ 
+ #if TARGET_API_MAC_CARBON
+   init_required_apple_events ();
+ 
+   DisableMenuCommand (NULL, kHICommandQuit);
+ #endif
  }