2000-11-05 Simon Josefsson <sj@extundo.com>

	* mml-smime.el (mml-smime-sign): Not used.
	(mml-smime-encrypt): Ditto.

	* mm-decode.el (mml-smime-verify): Autoload mml-smime.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3331993..9660a84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-11-05  Simon Josefsson  <sj@extundo.com>
 
+       * mml-smime.el (mml-smime-sign): Not used.
+       (mml-smime-encrypt): Ditto.
+
+       * mm-decode.el (mml-smime-verify): Autoload mml-smime.
+
        Verify S/MIME signature support.
        
        * mm-decode.el (mm-inline-media-tests): Add

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index f1fac96..a431876 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -225,6 +225,7 @@ to:
 (defvar mm-dissect-default-type "text/plain")
 
 (autoload 'mml2015-verify "mml2015")
+(autoload 'mml-smime-verify "mml-smime")
 
 (defvar mm-verify-function-alist
   '(("application/pgp-signature" mml2015-verify "PGP")

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 10d815b..b25e36b 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -23,6 +23,8 @@
 
 ;;; Commentary:
 
+;; todo: move s/mime code from mml-sec.el here.
+
 ;;; Code:
 
 (require 'smime)
@@ -31,33 +33,6 @@
   (smime-verify-buffer)
   handle)
 
-;;;###autoload
-(defun mml-smime-sign (cont)
-  ;; FIXME: You have to input the sender.
-  (when (null smime-keys)
-    (error "Please use M-x customize RET smime RET to configure SMIME"))
-  (smime-sign-buffer)
-  (goto-char (point-min))
-  (when (looking-at "^MIME-Version: 1.0")
-    (forward-line 1)
-    (delete-region (point-min) (point)))
-  (goto-char (point-max)))
-  
-;;;###autoload
-(defun mml-smime-encrypt (cont)
-  ;; FIXME: You have to input the receiptant.
-  ;; FIXME: Should encrypt to myself so I can read it??
-  (smime-encrypt-buffer)
-  (goto-char (point-min))
-  (when (looking-at "^MIME-Version: 1.0")
-    (forward-line 1)
-    (delete-region (point-min) (point)))
-  (goto-char (point-max)))
-
-;;;###autoload
-(defun mml-smime-setup ()
-  )
-
 (provide 'mml-smime)
 
 ;;; mml-smime.el ends here