Index: mailcap.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mailcap.el,v
retrieving revision 1.16
diff -u -r1.16 mailcap.el
--- mailcap.el	21 Jan 2007 02:54:13 -0000	1.16
+++ mailcap.el	8 Jul 2007 04:58:29 -0000
@@ -74,10 +74,6 @@
 ;; files for the rest?  -- fx
 (defvar mailcap-mime-data
   `(("application"
-     ("vnd.ms-excel"
-      (viewer . "gnumeric %s")
-      (test   . (getenv "DISPLAY"))
-      (type . "application/vnd.ms-excel"))
      ("x-x509-ca-cert"
       (viewer . ssl-view-site-cert)
       (test . (fboundp 'ssl-view-site-cert))
@@ -86,21 +82,6 @@
       (viewer . ssl-view-user-cert)
       (test . (fboundp 'ssl-view-user-cert))
       (type . "application/x-x509-user-cert"))
-     ("octet-stream"
-      (viewer . mailcap-save-binary-file)
-      (non-viewer . t)
-      (type . "application/octet-stream"))
-     ("dvi"
-      (viewer . "xdvi -safer %s")
-      (test   . (eq window-system 'x))
-      ("needsx11")
-      (type   . "application/dvi")
-      ("print" . "dvips -qRP %s"))
-     ("dvi"
-      (viewer . "dvitty %s")
-      (test   . (not (getenv "DISPLAY")))
-      (type   . "application/dvi")
-      ("print" . "dvips -qRP %s"))
      ("emacs-lisp"
       (viewer . mailcap-maybe-eval)
       (type   . "application/emacs-lisp"))
@@ -131,11 +112,39 @@
       (viewer . texinfo-mode)
       (test   . (fboundp 'texinfo-mode))
       (type   . "application/tex"))
+     ("sieve"
+      (viewer . sieve-mode)
+      (test   . (fboundp 'sieve-mode))
+      (type   . "application/sieve"))
      ("zip"
       (viewer . mailcap-save-binary-file)
       (non-viewer . t)
       (type   . "application/zip")
       ("copiousoutput"))
+     ("octet-stream"
+      (viewer . mailcap-save-binary-file)
+      (non-viewer . t)
+      (type . "application/octet-stream"))
+     (".*"
+      (viewer . "open %s")
+      (type . "application/*")
+      (test . (eq window-system 'mac))
+      ("print" . "lpr %s"))
+     ("vnd.ms-excel"
+      (viewer . "gnumeric %s")
+      (test   . (getenv "DISPLAY"))
+      (type . "application/vnd.ms-excel"))
+     ("dvi"
+      (viewer . "xdvi -safer %s")
+      (test   . (eq window-system 'x))
+      ("needsx11")
+      (type   . "application/dvi")
+      ("print" . "dvips -qRP %s"))
+     ("dvi"
+      (viewer . "dvitty %s")
+      (test   . (not (getenv "DISPLAY")))
+      (type   . "application/dvi")
+      ("print" . "dvips -qRP %s"))
      ("pdf"
       (viewer . "gv -safer %s")
       (type . "application/pdf")
@@ -174,15 +183,16 @@
       (test . (not (getenv "DISPLAY")))
       ("print" . ,(concat mailcap-print-command " %s"))
       ("copiousoutput"))
-     ("sieve"
-      (viewer . sieve-mode)
-      (test   . (fboundp 'sieve-mode))
-      (type   . "application/sieve"))
      ("pgp-keys"
       (viewer . "gpg --import --interactive --verbose")
       (type   . "application/pgp-keys")
       ("needsterminal")))
     ("audio"
+     (".*"
+      (viewer . "open %s")
+      (type . "audio/*")
+      (test . (eq window-system 'mac))
+      ("print" . "lpr %s"))
      ("x-mpeg"
       (viewer . "maplay %s")
       (type   . "audio/x-mpeg"))
@@ -207,6 +217,11 @@
       (viewer . view-mode)
       (type   . "message/rfc822")))
     ("image"
+     (".*"
+      (viewer . "open %s")
+      (type . "image/*")
+      (test . (eq window-system 'mac))
+      ("print" . "lpr %s"))
      ("x-xwd"
       (viewer  . "xwud -in %s")
       (type    . "image/x-xwd")
@@ -271,7 +286,12 @@
      ("tar"
       (viewer . tar-mode)
       (type . "archive/tar")
-      (test . (fboundp 'tar-mode)))))
+      (test . (fboundp 'tar-mode))))
+    ("default"
+     (".*"
+      (viewer . "open %s")
+      (test . (eq window-system 'mac))
+      ("print" . "lpr %s"))))
   "The mailcap structure is an assoc list of assoc lists.
 1st assoc list is keyed on the major content-type
 2nd assoc list is keyed on the minor content-type (which can be a regexp)
@@ -762,7 +782,7 @@
 	(setq viewer (car passed)))
       (cond
        ((and (null viewer) (not (equal major "default")) request)
-	(mailcap-mime-info "default" request))
+	(mailcap-mime-info "default/*" request))
        ((or (null request) (equal request ""))
 	(mailcap-unescape-mime-test (cdr (assq 'viewer viewer)) info))
        ((stringp request)