2003-10-18 Matt Swift <swift@alum.mit.edu>

	* mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e79c9d..489bd00 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-18  Matt Swift  <swift@alum.mit.edu>
+
+       * mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg. 
+
 2003-10-18  Romain FRANCOISE  <romain@orebokech.com>
 
        * message.el (message-forward-make-body): does both

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 0ec0070..ca716b1 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -155,7 +155,7 @@ set this variable to nil if you consider all urls to be safe."
   :group 'mime-display)
 
 (defcustom mm-inline-media-tests
-  '(("image/jpeg"
+  '(("image/p?jpeg"
      mm-inline-image
      (lambda (handle)
        (mm-valid-and-fit-image-p 'jpeg handle)))
@@ -241,7 +241,7 @@ set this variable to nil if you consider all urls to be safe."
     ;; Default to displaying as text
     (".*" mm-inline-text mm-readable-p))
   "Alist of media types/tests saying whether types can be displayed inline."
-  :type '(repeat (list (string :tag "MIME type")
+  :type '(repeat (list (regexp :tag "MIME type")
                       (function :tag "Display function")
                       (function :tag "Display test")))
   :group 'mime-display)