diff options
| author | Glenn Morris | 2010-10-31 19:11:34 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-31 19:11:34 -0700 |
| commit | b10d32ef78a009305572ac2b0922e24292fe73ac (patch) | |
| tree | 0b9cea0f8813e8166d23f27f104004b9137d7dac | |
| parent | 2b1e1ff4fa06c07526f36096c56dd119380a9a5f (diff) | |
| download | emacs-b10d32ef78a009305572ac2b0922e24292fe73ac.tar.gz emacs-b10d32ef78a009305572ac2b0922e24292fe73ac.zip | |
Silence smime.el compilation.
* lisp/gnus/smime.el (ldap-search): Declare.
(smime-cert-by-ldap-1): Require ldap on Emacs.
| -rw-r--r-- | lisp/gnus/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/smime.el | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index af52b316ea9..efc059aefe1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-11-01 Glenn Morris <rgm@gnu.org> | 1 | 2010-11-01 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * smime.el (ldap-search): Declare. | ||
| 4 | (smime-cert-by-ldap-1): Require ldap on Emacs. | ||
| 5 | |||
| 3 | * nnimap.el: Require nnmail, and gnus-sum when compiling. | 6 | * nnimap.el: Require nnmail, and gnus-sum when compiling. |
| 4 | (nnimap-keepalive): Use gnus-float-time. | 7 | (nnimap-keepalive): Use gnus-float-time. |
| 5 | 8 | ||
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index e28c07ffaad..acb50f11321 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el | |||
| @@ -587,6 +587,9 @@ A string or a list of strings is returned." | |||
| 587 | (kill-buffer digbuf) | 587 | (kill-buffer digbuf) |
| 588 | retbuf)) | 588 | retbuf)) |
| 589 | 589 | ||
| 590 | (declare-function ldap-search "ldap" | ||
| 591 | (filter &optional host attributes attrsonly withdn)) | ||
| 592 | |||
| 590 | (defun smime-cert-by-ldap-1 (mail host) | 593 | (defun smime-cert-by-ldap-1 (mail host) |
| 591 | "Get cetificate for MAIL from the ldap server at HOST." | 594 | "Get cetificate for MAIL from the ldap server at HOST." |
| 592 | (let ((ldapresult | 595 | (let ((ldapresult |
| @@ -595,7 +598,9 @@ A string or a list of strings is returned." | |||
| 595 | (progn | 598 | (progn |
| 596 | (require 'smime-ldap) | 599 | (require 'smime-ldap) |
| 597 | 'smime-ldap-search) | 600 | 'smime-ldap-search) |
| 598 | 'ldap-search) | 601 | (progn |
| 602 | (require 'ldap) | ||
| 603 | 'ldap-search)) | ||
| 599 | (concat "mail=" mail) | 604 | (concat "mail=" mail) |
| 600 | host '("userCertificate") nil)) | 605 | host '("userCertificate") nil)) |
| 601 | (retbuf (generate-new-buffer (format "*certificate for %s*" mail))) | 606 | (retbuf (generate-new-buffer (format "*certificate for %s*" mail))) |