[Emacs-diffs] /srv/bzr/emacs/trunk r102187: Silence smime.el compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 102187
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 19:11:34 -0700
message:
  Silence smime.el compilation.
  * lisp/gnus/smime.el (ldap-search): Declare.
  (smime-cert-by-ldap-1): Require ldap on Emacs.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/smime.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-01 02:07:01 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-01 02:11:34 +0000
@@ -1,5 +1,8 @@
 2010-11-01  Glenn Morris  <address@hidden>
 
+       * smime.el (ldap-search): Declare.
+       (smime-cert-by-ldap-1): Require ldap on Emacs.
+
        * nnimap.el: Require nnmail, and gnus-sum when compiling.
        (nnimap-keepalive): Use gnus-float-time.
 

=== modified file 'lisp/gnus/smime.el'
--- a/lisp/gnus/smime.el        2010-10-11 23:29:33 +0000
+++ b/lisp/gnus/smime.el        2010-11-01 02:11:34 +0000
@@ -587,6 +587,9 @@
       (kill-buffer digbuf)
       retbuf))
 
+(declare-function ldap-search "ldap"
+                 (filter &optional host attributes attrsonly withdn))
+
 (defun smime-cert-by-ldap-1 (mail host)
   "Get cetificate for MAIL from the ldap server at HOST."
   (let ((ldapresult
@@ -595,7 +598,9 @@
              (progn
                (require 'smime-ldap)
                'smime-ldap-search)
-           'ldap-search)
+           (progn
+             (require 'ldap)
+             'ldap-search))
          (concat "mail=" mail)
          host '("userCertificate") nil))
        (retbuf (generate-new-buffer (format "*certificate for %s*" mail)))