(nnmail-broken-references-mailers): New variable.

[gnus] / lisp / smime.el

diff --git a/lisp/smime.el b/lisp/smime.el
index 369f92a..cb53418 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -1,7 +1,7 @@
 ;;; smime.el --- S/MIME support library
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: SMIME X.509 PEM OpenSSL
@@ -367,9 +367,10 @@ KEYFILE should contain a PEM encoded key and certificate."
                 keyfile
               (smime-get-key-with-certs-by-email
                (completing-read
-                (concat "Sign using which key? "
-                        (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                          ""))
+                (concat "Sign using key"
+                        (if smime-keys
+                            (concat " (default " (caar smime-keys) "): ")
+                          ": "))
                 smime-keys nil nil (car-safe (car-safe smime-keys))))))
       (error "Signing failed"))))
 
@@ -498,9 +499,9 @@ in the buffer specified by `smime-details-buffer'."
       (or keyfile
          (smime-get-key-by-email
           (completing-read
-           (concat "Decipher using which key? "
-                   (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                     ""))
+           (concat "Decipher using key"
+                   (if smime-keys (concat " (default " (caar smime-keys) "): ")
+                     ": "))
            smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
 
 ;; Various operations
@@ -593,7 +594,8 @@ A string or a list of strings is returned."
                                       host '("userCertificate") nil))
        (retbuf (generate-new-buffer (format "*certificate for %s*" mail)))
        cert)
-    (if (>= (length ldapresult) 1)
+    (if (and (>= (length ldapresult) 1)
+             (> (length (cadaar ldapresult)) 0))
        (with-current-buffer retbuf
          ;; Certificates on LDAP servers _should_ be in DER format,
          ;; but there are some servers out there that distributes the