Rename `mime-preview/' -> `mime-preview-'.

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

diff --git a/mime-image.el b/mime-image.el
index d865010..825a419 100644 (file)
--- 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.10 1997-04-03 18:09:35 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)
@@ -67,12 +65,12 @@
        ;;
        (autoload 'highlight-headers "highlight-headers")
        
-       (defun mime-preview/x-face-function-use-highlight-headers ()
+       (defun mime-preview-x-face-function-use-highlight-headers ()
         (highlight-headers (point-min) (re-search-forward "^$" nil t) t)
         )
        
        (add-hook 'mime-view-content-header-filter-hook
-                'mime-preview/x-face-function-use-highlight-headers)
+                'mime-preview-x-face-function-use-highlight-headers)
        
        )
       ((featurep 'mule)
@@ -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)
         )
@@ -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")
@@ -207,13 +206,17 @@
     (delete-file gif-file)
     ))
 
-(set-alist 'mime-view-content-filter-alist
-          "application/postscript"
-          (function mime-view-filter-for-application/postscript))
+;; If you would like to display inline Postscript image, please
+;; activate following:
 
-(if (featurep 'gif)
-    (add-to-list 'mime-view-visible-media-type-list "application/postscript")
-  )
+;; (set-alist 'mime-view-content-filter-alist
+;;            "application/postscript"
+;;            (function mime-view-filter-for-application/postscript))
+
+;; (if (featurep 'gif)
+;;     (add-to-list
+;;      'mime-view-visible-media-type-list "application/postscript")
+;;   )
 
 
 ;;; @ end