tm 7.75.

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

diff --git a/tm-image.el b/tm-image.el
index 384269b..ecc9fc7 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.10 1996/07/15 19:21:48 morioka Exp $
+;;;    $Id: tm-image.el,v 7.12 1996/08/01 06:42:04 morioka Exp $
 ;;;
 ;;; Keywords: mail, news, MIME, multimedia, image, picture
 ;;;
@@ -84,7 +84,7 @@
                )
              )))
        
-       (defun bitmap-read-xbm (file)
+       (defun bitmap-insert-xbm-file (file)
         (let (gl)
           (while (progn
                    (setq gl (make-glyph file))
@@ -114,11 +114,12 @@
           ))
        )
       ((boundp 'MULE)
-       (require 'bitmap)
+       (require 'x-face-mule)
        
        (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
        
-       (defvar mime-preview/x-face-function (function bitmap-decode-x-face))
+       (defvar mime-preview/x-face-function
+        (function x-face-decode-message-header))
        ))
 
 (defvar mime-viewer/shell-command "/bin/sh")
@@ -169,7 +170,7 @@
                   xbm-file))
          (while (not (file-exists-p xbm-file)))
          (delete-region beg end)
-         (bitmap-read-xbm xbm-file)
+         (bitmap-insert-xbm-file xbm-file)
          (condition-case nil
              (delete-file xbm-file)
            (error nil))
@@ -230,7 +231,7 @@
     (mime-decode-region beg end encoding)
     (write-region (point-min)(point-max) xbm-file)
     (delete-region (point-min)(point-max))
-    (bitmap-read-xbm xbm-file)
+    (bitmap-insert-xbm-file xbm-file)
     (delete-file xbm-file)
     ))