tm 7.60.

[elisp/tm.git] / tm-image.el

diff --git a/tm-image.el b/tm-image.el
index a0d3b8d..23c3fcd 100644 (file)
--- a/tm-image.el
+++ b/tm-image.el
@@ -10,7 +10,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/15
 ;;; Version:
-;;;    $Id: tm-image.el,v 7.2 1996/04/14 00:14:46 morioka Exp $
+;;;    $Id: tm-image.el,v 7.3 1996/04/26 04:20:52 morioka Exp $
 ;;;
 ;;; Keywords: mail, news, MIME, multimedia, image, picture
 ;;;
@@ -125,8 +125,7 @@
        
        (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
        
-       (defvar mime-preview/x-face-function
-        (function mime-preview/x-face-function-for-mule))
+       (defvar mime-preview/x-face-function (function bitmap-decode-x-face))
        ))
 
 (defvar mime-viewer/shell-command "/bin/sh")
@@ -181,63 +180,6 @@
            (error nil))
          ))))
 
-(defun mime-preview/x-face-function-for-mule ()
-  (save-restriction
-    (narrow-to-region (point-min)
-                     (if (re-search-forward "^$" nil t)
-                         (match-end 0)
-                       (point-max)
-                       ))
-    (goto-char (point-min))
-    (if (re-search-forward "^X-Face:[ \t]*" nil t)
-       (let ((p (match-beginning 0))
-             (beg (match-end 0))
-             (end (rfc822/field-end))
-             (xbm-file
-              (concat
-               (make-temp-name (expand-file-name "tmxf" mime/tmp-dir))
-               ".xbm")
-              ))
-         (if (< end (point-max))
-             (setq end (1+ end))
-           )
-         (while (progn
-                  (call-process-region
-                   beg end "sh" nil 0 nil
-                   "-c"
-                   (format "%s > %s"
-                           mime-viewer/x-face-to-xbm-command
-                           xbm-file))
-                  (not (file-exists-p xbm-file))
-                  ))
-         (save-restriction
-           (narrow-to-region p end)
-           (delete-region p end)
-           (goto-char p)
-           (while (progn
-                    (condition-case nil
-                        (bitmap-read-xbm xbm-file)
-                      (error nil))
-                    (kill-buffer 
-                     (some-element
-                      (function
-                       (lambda (buf)
-                         (string-equal (buffer-file-name buf) xbm-file)
-                         ))
-                      (buffer-list)))
-                    (= (point-min) (point-max))
-                    ))
-           (goto-char p)
-           (insert "X-Face: ")
-           (while (re-search-forward "^." nil t)
-             (goto-char (match-beginning 0))
-             (insert "        ")
-             ))
-         (condition-case nil
-             (delete-file xbm-file)
-           (error nil))
-         ))))
-
 
 ;;; @ content filter for images
 ;;;