Bind RET and TAB on images for better UX.

[gnus] / lisp / mml-smime.el

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index bf4ac6f..1773299 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -1,7 +1,7 @@
 ;;; mml-smime.el --- S/MIME support for MML
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: Gnus, MIME, S/MIME, MML
@@ -462,7 +462,7 @@ Content-Disposition: attachment; filename=smime.p7s
                         (message-options-set 'message-recipients
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))
-      (if (eq mm-sign-option 'guided)
+      (if (eq mm-encrypt-option 'guided)
          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.
@@ -520,10 +520,14 @@ Content-Disposition: attachment; filename=smime.p7m
                                           ctl 'protocol)
                                          "application/pkcs7-signature")
                                  t)))
-               (null (setq signature (mm-find-part-by-type
-                                      (cdr handle)
-                                      "application/pkcs7-signature"
-                                      nil t))))
+               (null (setq signature (or (mm-find-part-by-type
+                                          (cdr handle)
+                                          "application/pkcs7-signature"
+                                          nil t)
+                                         (mm-find-part-by-type
+                                          (cdr handle)
+                                          "application/x-pkcs7-signature"
+                                          nil t)))))
        (mm-set-handle-multipart-parameter
         mm-security-handle 'gnus-info "Corrupted")
        (throw 'error handle))
@@ -550,5 +554,4 @@ Content-Disposition: attachment; filename=smime.p7m
 
 (provide 'mml-smime)
 
-;; arch-tag: f1bf94d4-f2cd-4c6f-b059-ad69492817e2
 ;;; mml-smime.el ends here