From: Glenn Morris <rgm@gnu.org>
Date: Mon, 1 Nov 2010 02:11:34 +0000 (-0700)
Subject: Silence smime.el compilation.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~422^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b10d32ef78a009305572ac2b0922e24292fe73ac;p=emacs.git

Silence smime.el compilation.
* lisp/gnus/smime.el (ldap-search): Declare.
(smime-cert-by-ldap-1): Require ldap on Emacs.
---

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 @@
 2010-11-01  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
 
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."
       (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 @@ A string or a list of strings is returned."
 	      (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)))