X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-image.el;h=d24963aefba8dfc52b454d2d31efb3c98b63cedc;hb=0c115c3068d06f197bf3cb99aad53c3a948a15a0;hp=012476d6ded3fea0e0e1d9b506bbb2e36c84d51e;hpb=80d0ec290ce71dc056aa14e962ac186f1388fbad;p=elisp%2Fsemi.git

diff --git a/mime-image.el b/mime-image.el
index 012476d..d24963a 100644
--- a/mime-image.el
+++ b/mime-image.el
@@ -1,6 +1,6 @@
 ;;; mime-image.el --- mime-view filter to display images
 
-;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko
+;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
 ;; Copyright (C) 1996 Dan Rich
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -8,12 +8,10 @@
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/12/15
 ;;	Renamed: 1997/2/21 from tm-image.el
-;; Version:
-;;	$Id: mime-image.el,v 0.3 1997-03-04 13:05:34 morioka Exp $
 
 ;; Keywords: image, picture, X-Face, MIME, multimedia, mail, news
 
-;; This file is part of XEmacs.
+;; This file is part of SEMI (Suite of Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -39,7 +37,7 @@
 (require 'mime-view)
 (require 'alist)
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        (require 'images)
        
        (defun-maybe image-inline-p (format)
@@ -93,7 +91,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 +116,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 +133,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,16 +143,13 @@
 ;;;
 ;;    (for XEmacs 19.12 or later)
 
-(defun mime-preview/filter-for-image (ctype params encoding)
-  (let* ((mode mime::preview/original-major-mode)
-	 (m (assq mode mime-view-code-converter-alist))
-	 (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)
-    (let* ((minor (assoc-value ctype mime-view-image-converter-alist))
+    (let* ((minor (cdr (assoc ctype mime-view-image-converter-alist)))
 	   (gl (image-normalize minor (buffer-string)))
 	   e)
       (delete-region (point-min)(point-max))
@@ -189,10 +185,8 @@
 ;;;
 ;;    (for XEmacs 19.14 or later)
 
-(defun mime-preview/filter-for-application/postscript (ctype params encoding)
-  (let* ((mode mime::preview/original-major-mode)
-	 (m (assq mode mime-view-code-converter-alist))
-	 (beg (point-min)) (end (point-max))
+(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)))
 	 (ps-file (concat file-base ".ps"))
@@ -212,14 +206,17 @@
     (delete-file gif-file)
     ))
 
-(set-alist 'mime-view-content-filter-alist
-	   "application/postscript"
-	   (function mime-preview/filter-for-application/postscript))
+;; If you would like to display inline Postscript image, please
+;; activate following:
+
+;; (set-alist 'mime-view-content-filter-alist
+;;            "application/postscript"
+;;            (function mime-view-filter-for-application/postscript))
 
-(if (featurep 'gif)
-    (add-to-list 'mime-view-default-showing-Content-Type-list
-		 "application/postscript")
-  )
+;; (if (featurep 'gif)
+;;     (add-to-list
+;;      'mime-view-visible-media-type-list "application/postscript")
+;;   )
 
 
 ;;; @ end