X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-image.el;h=a405a4a14ea676a455f75e45d14beff643c4dedd;hb=0045e15bddeea7cf2fbda9cf5d8fa6551b17f276;hp=37c8ca62a43b9ed5181a60f12ddb07c151dbd04b;hpb=7c4f35fa8937210de3aa1772087240a08c93ad52;p=elisp%2Fsemi.git

diff --git a/mime-image.el b/mime-image.el
index 37c8ca6..a405a4a 100644
--- a/mime-image.el
+++ b/mime-image.el
@@ -105,31 +105,20 @@
 	  ))
     )
 
-(defvar mime-view-image-converter-alist nil)
-
 (mapcar (function
 	 (lambda (rule)
 	   (let ((type    (car rule))
 		 (subtype (nth 1 rule))
 		 (format  (nth 2 rule)))
 	     (if (image-inline-p format)
-		 (let ((type/subtype (mime-type/subtype-string type subtype)))
-                   ;; (set-alist 'mime-view-content-filter-alist
-                   ;;            type/subtype #'mime-view-filter-for-image)
-		   (set-alist 'mime-view-image-converter-alist
-			      type/subtype format)
-                   ;; (add-to-list
-                   ;;  'mime-view-visible-media-type-list
-                   ;;  ctype)
-		   (ctree-set-calist-strictly
-		    'mime-preview-condition
-		    (list (cons 'type type)(cons 'subtype subtype)
-			  '(body . visible)
-			  '(body-presentation-method . with-filter)
-			  (cons 'body-filter
-				#'mime-view-filter-for-image)))
-		   )
-	       ))))
+		 (ctree-set-calist-strictly
+		  'mime-preview-condition
+		  (list (cons 'type type)(cons 'subtype subtype)
+			'(body . visible)
+			'(body-presentation-method . with-filter)
+			(cons 'body-filter #'mime-preview-filter-for-image)
+			(cons 'image-format format))
+		  )))))
 	'((image jpeg		jpeg)
 	  (image gif		gif)
 	  (image tiff		tiff)
@@ -142,25 +131,19 @@
 	  (image png		png)
 	  ))
 
-;; (defvar mime-view-ps-to-gif-command "pstogif")
-
 
 ;;; @ content filter for images
 ;;;
 ;;    (for XEmacs 19.12 or later)
 
-(defun mime-view-filter-for-image (situation)
+(defun mime-preview-filter-for-image (situation)
   (let ((beg (point-min))
 	(end (point-max)))
     (remove-text-properties beg end '(face nil))
     (message "Decoding image...")
     (mime-decode-region beg end (cdr (assq 'encoding situation)))
-    (let* ((minor (cdr (assoc (mime-type/subtype-string
-			       (cdr (assq 'type situation))
-			       (cdr (assq 'subtype situation)))
-			      mime-view-image-converter-alist)))
-	   (gl (image-normalize minor (buffer-string)))
-	   e)
+    (let ((gl (image-normalize (cdr (assq 'image-format situation))
+			       (buffer-string))))
       (delete-region (point-min)(point-max))
       (cond ((image-invalid-glyph-p gl)
 	     (setq gl nil)
@@ -181,8 +164,9 @@
 	     )
 	    (t
 	     (setq gl (make-glyph gl))
-	     (setq e (make-extent (point) (point)))
-	     (set-extent-end-glyph e gl)
+	     (let ((e (make-extent (point) (point))))
+	       (set-extent-end-glyph e gl)
+	       )
 	     (message "Decoding image... done")
 	     ))
       )
@@ -194,7 +178,9 @@
 ;;;
 ;;    (for XEmacs 19.14 or later)
 
-;; (defun mime-view-filter-for-application/postscript (ctype params encoding)
+;; (defvar mime-view-ps-to-gif-command "pstogif")
+
+;; (defun mime-preview-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)))
@@ -220,7 +206,7 @@
 
 ;; (set-alist 'mime-view-content-filter-alist
 ;;            "application/postscript"
-;;            (function mime-view-filter-for-application/postscript))
+;;            (function mime-preview-filter-for-application/postscript))
 
 ;; (if (featurep 'gif)
 ;;     (add-to-list