Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-667
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-669
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-670
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-157
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-158
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-159
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-160
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-161
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-165
   Update from CVS: texi/message.texi: Fix default values.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-167
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-168
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-448

2 files changed, 21 insertions, 5 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index e61cb12a946..cc097906046 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * Emacs.app/Contents/Info.plist: Add CFBundleURLTypes key and
+        data.  Make NSServices open-selection the first entry.
+
 2005-11-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * makefile.MPW (shortlisp): Sync with src/Makefile.in.
diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index 176dbf81276..d03123cc3cd 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -35,7 +35,18 @@
         <string>EMAx</string>
         <key>CFBundleVersion</key>
         <string>1.1</string>
-        <key>NSServices</key>
+        <key>CFBundleURLTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleURLName</key>
+                        <string>Email Address URL</string>
+                        <key>CFBundleURLSchemes</key>
+                        <array>
+                                <string>mailto</string>
+                        </array>
+                </dict>
+        </array>
+        <key>NSServices</key>
         <array>
                 <dict>
                         <key>NSKeyEquivalent</key>
@@ -43,10 +54,10 @@
                         <key>NSMenuItem</key>
                         <dict>
                                 <key>default</key>
-                                <string>Emacs/Open Selected File</string>
+                                <string>Emacs/New Buffer Containing Selection</string>
                         </dict>
                         <key>NSMessage</key>
-                        <string>open-file</string>
+                        <string>open-selection</string>
                         <key>NSPortName</key>
                         <string>Emacs</string>
                         <key>NSReturnTypes</key>
@@ -62,10 +73,10 @@
                         <key>NSMenuItem</key>
                         <dict>
                                 <key>default</key>
-                                <string>Emacs/New Buffer Containing Selection</string>
+                                <string>Emacs/Open Selected File</string>
                         </dict>
                         <key>NSMessage</key>
-                        <string>open-selection</string>
+                        <string>open-file</string>
                         <key>NSPortName</key>
                         <string>Emacs</string>
                         <key>NSReturnTypes</key>