update.

[elisp/semi.git] / semi-setup.el

diff --git a/semi-setup.el b/semi-setup.el
index 00d6500..f4da19e 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -45,18 +45,14 @@ it is used as hook to set."
 (defvar mime-setup-enable-inline-image
   (and window-system
        (or (featurep 'xemacs)
-          (and (featurep 'mule)(module-installed-p 'bitmap))
-          ))
+          (and (featurep 'mule)
+               (or (fboundp 'create-image)
+                   (module-installed-p 'bitmap)))))
   "*If it is non-nil, semi-setup sets up to use mime-image.")
 
 (if mime-setup-enable-inline-image
-    (call-after-loaded 'mime-view
-                      (function
-                       (lambda ()
-                         (require 'mime-image)
-                         )))
-  )
-
+    (eval-after-load "mime-view"
+      '(require 'mime-image)))
 
 ;; for text/html
 (defvar mime-setup-enable-inline-html
@@ -138,13 +134,13 @@ it is used as hook to set."
         (mime-add-condition
          'action
          '((type . application)(subtype . pkcs7-mime)
-           (method . mime-decrypt-application/pkcs7-mime))
+           (method . mime-view-application/pkcs7-mime))
          'strict "mime-pgp")
 
         (mime-add-condition
          'action
          '((type . application)(subtype . x-pkcs7-mime)
-           (method . mime-decrypt-application/pkcs7-mime))
+           (method . mime-view-application/pkcs7-mime))
          'strict "mime-pgp")
         ))
   )
@@ -153,23 +149,23 @@ it is used as hook to set."
 ;;; @ for mime-edit
 ;;;
 
-(defun mime-setup-decode-message-header ()
-  (save-excursion
-    (save-restriction
-      (goto-char (point-min))
-      (narrow-to-region
-       (point-min)
-       (if (re-search-forward
-           (concat "^" (regexp-quote mail-header-separator) "$")
-           nil t)
-          (match-beginning 0)
-        (point-max)
-        ))
-      (mime-decode-header-in-buffer)
-      (set-buffer-modified-p nil)
-      )))
-
-(add-hook 'mime-edit-mode-hook 'mime-setup-decode-message-header)
+;; (defun mime-setup-decode-message-header ()
+;;   (save-excursion
+;;     (save-restriction
+;;       (goto-char (point-min))
+;;       (narrow-to-region
+;;        (point-min)
+;;        (if (re-search-forward
+;;             (concat "^" (regexp-quote mail-header-separator) "$")
+;;             nil t)
+;;            (match-beginning 0)
+;;          (point-max)
+;;          ))
+;;       (mime-decode-header-in-buffer)
+;;       (set-buffer-modified-p nil)
+;;       )))
+
+;; (add-hook 'mime-edit-mode-hook 'mime-setup-decode-message-header)
 
 
 ;;; @@ variables
@@ -207,7 +203,7 @@ it is used as hook to set."
 ;;; @ for mu-cite
 ;;;
 
-(add-hook 'mu-cite/pre-cite-hook 'eword-decode-header)
+;; (add-hook 'mu-cite/pre-cite-hook 'eword-decode-header)
 
 
 ;;; @ end