# HG changeset patch
# User Andrew Choi <akochoi@shaw.ca>
# Date 1025553753 0
# Node ID 2198a6632b2b2782873a7e5187760cf0b3c0c7b2
# Parent  7177a47bc55757abce25f052bc9981d595d8e7d9
In mac:

2002-07-01  Andrew Choi  <akochoi@shaw.ca>

        * Emacs.app/Contents/Resources/Emacs.icns: New file.

        * Emacs.app/Contents/Info.plist: Add CFBundleDocumentTypes and
        CFBundleIconFile entries.

In src:

2002-07-01  Andrew Choi  <akochoi@shaw.ca>

        * macterm.c (do_ae_open_documents) [MAC_OSX]: Call FSpMakeFSRef
        and FSRefMakePath to convert FSSpec returned with Apple Event to
        Posix pathname.
        (mac_initialize) [TARGET_API_MAC_CARBON]: Call
        init_required_apple_events and disable the `Quit' menu item
        provided automatically by the Carbon Toolbox.

diff -r 7177a47bc557 -r 2198a6632b2b mac/ChangeLog
--- a/mac/ChangeLog	Mon Jul 01 19:55:45 2002 +0000
+++ b/mac/ChangeLog	Mon Jul 01 20:02:33 2002 +0000
@@ -1,3 +1,10 @@
+2002-07-01  Andrew Choi  <akochoi@shaw.ca>
+
+	* Emacs.app/Contents/Resources/Emacs.icns: New file.
+
+	* Emacs.app/Contents/Info.plist: Add CFBundleDocumentTypes and
+	CFBundleIconFile entries.
+
 2002-04-13  Andrew Choi  <akochoi@shaw.ca>
 
 	* Emacs.app/Contents/Info.plist: New file.
@@ -137,7 +144,7 @@
 	cursor row is invisible.  This can happen if cursor is on top line
 	of a window, and we switch to a buffer with a header line.
 
-2001-12-22  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-22  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* cw5-mcp.xml, cw6-mcp.xml, makefile.MPW: Remove mocklisp files.
 
@@ -146,7 +153,7 @@
 	* src/macfns.c (x_report_frame_params): Make the scroll-bar-width
 	frame parameter have a numeric value all the time.
 
-2001-12-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* COPYING: New file.
 
@@ -164,7 +171,7 @@
 	* src/macterm.c: Merged changes from xterm.c.
 	* src/macfns.c: Merged changes from xfns.c.
 
-2001-11-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* src/macterm.c (waiting_for_input): Remove unnecessary declaration.
 
@@ -268,7 +275,7 @@
 
 	* inc/macterm.h (x_display_list): Declare extern.
 
-2001-07-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-20  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* src/macterm.c (xim_open_dpy): Fix typo.
 
diff -r 7177a47bc557 -r 2198a6632b2b mac/Emacs.app/Contents/Info.plist
--- a/mac/Emacs.app/Contents/Info.plist	Mon Jul 01 19:55:45 2002 +0000
+++ b/mac/Emacs.app/Contents/Info.plist	Mon Jul 01 20:02:33 2002 +0000
@@ -4,8 +4,29 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>*</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>All</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>****</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
 	<key>CFBundleExecutable</key>
 	<string>Emacs</string>
+	<key>CFBundleIconFile</key>
+	<string>Emacs.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.gnu.Emacs</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -13,6 +34,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.1</string>
+	<string>1.1</string>
 </dict>
 </plist>
diff -r 7177a47bc557 -r 2198a6632b2b mac/Emacs.app/Contents/Resources/Emacs.icns
Binary file mac/Emacs.app/Contents/Resources/Emacs.icns has changed
diff -r 7177a47bc557 -r 2198a6632b2b src/ChangeLog
--- a/src/ChangeLog	Mon Jul 01 19:55:45 2002 +0000
+++ b/src/ChangeLog	Mon Jul 01 20:02:33 2002 +0000
@@ -1,3 +1,12 @@
+2002-07-01  Andrew Choi  <akochoi@shaw.ca>
+
+	* macterm.c (do_ae_open_documents) [MAC_OSX]: Call FSpMakeFSRef
+	and FSRefMakePath to convert FSSpec returned with Apple Event to
+	Posix pathname.
+	(mac_initialize) [TARGET_API_MAC_CARBON]: Call
+	init_required_apple_events and disable the `Quit' menu item
+	provided automatically by the Carbon Toolbox.
+
 2002-07-01  Dave Love  <fx@gnu.org>
 
 	* keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
@@ -135,7 +144,7 @@
 	* w32fns.c (file_dialog_callback): New function.
 	(Fx_file_dialog): Allow selecting directories as well as files.
 
-2002-06-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-06-21  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* m/pmax.h (START_FILES): Define START_FILES for NetBSD and
 	OpenBSD. Add support for mipseb-*-netbsd* machines.
diff -r 7177a47bc557 -r 2198a6632b2b src/macterm.c
--- a/src/macterm.c	Mon Jul 01 19:55:45 2002 +0000
+++ b/src/macterm.c	Mon Jul 01 20:02:33 2002 +0000
@@ -12123,20 +12123,31 @@
         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);
-        }
+        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,6 +13153,12 @@
 #endif
 
   mac_initialize_display_info ();
+
+#if TARGET_API_MAC_CARBON
+  init_required_apple_events ();
+
+  DisableMenuCommand (NULL, kHICommandQuit);
+#endif
 }