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.

3 files changed, 33 insertions, 5 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 186a8564289..a07fe67e25c 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -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 --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index 4d51100f66b..774db36af76 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -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 --git a/mac/Emacs.app/Contents/Resources/Emacs.icns b/mac/Emacs.app/Contents/Resources/Emacs.icns
new file mode 100644
index 00000000000..25cc99fdd0e
--- /dev/null
+++ b/mac/Emacs.app/Contents/Resources/Emacs.icns