(mime-edit-x-emacs-value): Don't add mule-version if

[elisp/semi.git] / mime-image.el

diff --git a/mime-image.el b/mime-image.el
index ed2139d..cea123c 100644 (file)
--- a/mime-image.el
+++ b/mime-image.el
@@ -9,7 +9,7 @@
 ;; Created: 1995/12/15
 ;;     Renamed: 1997/2/21 from tm-image.el
 ;; Version:
-;;     $Id: mime-image.el,v 0.7 1997-03-15 21:00:47 morioka Exp $
+;;     $Id: mime-image.el,v 0.13 1997-09-25 12:31:15 morioka Exp $
 
 ;; Keywords: image, picture, X-Face, MIME, multimedia, mail, news
 
@@ -39,7 +39,7 @@
 (require 'mime-view)
 (require 'alist)
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        (require 'images)
        
        (defun-maybe image-inline-p (format)
@@ -93,7 +93,7 @@
        ;;
        ;; X-Face
        ;;
-       (if (file-installed-p uncompface-program exec-path)
+       (if (exec-installed-p uncompface-program exec-path)
           (add-hook 'mime-view-content-header-filter-hook
                     'x-face-decode-message-header)
         )
@@ -118,11 +118,11 @@
                 (progn
                   (set-alist 'mime-view-content-filter-alist
                              ctype
-                             (function mime-preview/filter-for-image))
+                             (function mime-view-filter-for-image))
                   (set-alist 'mime-view-image-converter-alist
                              ctype format)
                   (add-to-list
-                   'mime-view-default-showing-Content-Type-list
+                   'mime-view-visible-media-type-list
                    ctype)
                   )
               ))))
@@ -135,6 +135,7 @@
          ("image/x-xpixmap"            . xpm)
          ("image/x-pic"                . pic)
          ("image/x-mag"                . mag)
+         ("image/png"                  . png)
          ))
 
 (defvar mime-view-ps-to-gif-command "pstogif")
@@ -144,10 +145,9 @@
 ;;;
 ;;    (for XEmacs 19.12 or later)
 
-(defun mime-preview/filter-for-image (ctype params encoding)
-  (let* ((charset (assoc "charset" params))
-        (beg (point-min)) (end (point-max))
-        )
+(defun mime-view-filter-for-image (ctype params encoding)
+  (let ((beg (point-min))
+       (end (point-max)))
     (remove-text-properties beg end '(face nil))
     (message "Decoding image...")
     (mime-decode-region beg end encoding)
@@ -187,7 +187,7 @@
 ;;;
 ;;    (for XEmacs 19.14 or later)
 
-(defun mime-preview/filter-for-application/postscript (ctype params encoding)
+(defun mime-view-filter-for-application/postscript (ctype params encoding)
   (let* ((beg (point-min)) (end (point-max))
         (file-base
          (make-temp-name (expand-file-name "tm" mime-temp-directory)))
@@ -210,11 +210,10 @@
 
 (set-alist 'mime-view-content-filter-alist
           "application/postscript"
-          (function mime-preview/filter-for-application/postscript))
+          (function mime-view-filter-for-application/postscript))
 
 (if (featurep 'gif)
-    (add-to-list 'mime-view-default-showing-Content-Type-list
-                "application/postscript")
+    (add-to-list 'mime-view-visible-media-type-list "application/postscript")
   )