Synch to No Gnus 200411040624.

[elisp/gnus.git-] / lisp / mml-smime.el

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index bccc8a1..4154388 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -25,14 +25,24 @@
 
 ;;; Code:
 
-(require 'smime)
+(eval-when-compile (require 'cl))
+
+;; EMIKO doesn't provide the smime.el module.
+(condition-case nil
+    (require 'smime)
+  (error))
 (require 'mm-decode)
+(autoload 'message-narrow-to-headers "message")
+(autoload 'message-fetch-field "message")
 
 (defun mml-smime-sign (cont)
   (when (null smime-keys)
     (customize-variable 'smime-keys)
     (error "No S/MIME keys configured, use customize to add your key"))
   (smime-sign-buffer (cdr (assq 'keyfile cont)))
+  (goto-char (point-min))
+  (while (search-forward "\r\n" nil t)
+    (replace-match "\n" t t))
   (goto-char (point-max)))
 
 (defun mml-smime-encrypt (cont)