Mercurial > emacs
changeset 86345:84e43f9352ad
(smime-cert-by-ldap-1): Use `ldap-search' instead of
`smime-ldap-search' for Emacs 22 and up.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Thu, 22 Nov 2007 20:26:33 +0000 |
| parents | d6fc6b220aa7 |
| children | 605b05ee020f |
| files | lisp/gnus/ChangeLog lisp/gnus/smime.el |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Nov 22 20:26:33 2007 +0000 +++ b/lisp/gnus/ChangeLog Thu Nov 22 20:26:33 2007 +0000 @@ -1,3 +1,8 @@ +2007-11-22 Reiner Steib <Reiner.Steib@gmx.de> + + * smime.el (smime-cert-by-ldap-1): Use `ldap-search' instead of + `smime-ldap-search' for Emacs 22 and up. + 2007-11-22 Stefan Monnier <monnier@iro.umontreal.ca> * gnus-art.el (gnus-article-truncate-lines): Use `truncate-lines'.
--- a/lisp/gnus/smime.el Thu Nov 22 20:26:33 2007 +0000 +++ b/lisp/gnus/smime.el Thu Nov 22 20:26:33 2007 +0000 @@ -122,7 +122,6 @@ ;;; Code: (require 'dig) -(require 'smime-ldap) (require 'password) (eval-when-compile (require 'cl)) @@ -589,8 +588,17 @@ (defun smime-cert-by-ldap-1 (mail host) "Get cetificate for MAIL from the ldap server at HOST." - (let ((ldapresult (smime-ldap-search (concat "mail=" mail) - host '("userCertificate") nil)) + (let ((ldapresult + (funcall + (if (or (featurep 'xemacs) + ;; For Emacs >= 22 we don't need smime-ldap.el + (< emacs-major-version 22)) + (progn + (require 'smime-ldap) + 'smime-ldap-search) + 'ldap-search) + (concat "mail=" mail) + host '("userCertificate") nil)) (retbuf (generate-new-buffer (format "*certificate for %s*" mail))) cert) (if (and (>= (length ldapresult) 1)