changeset 111284:c8afa6dd9295

Silence smime.el compilation. * lisp/gnus/smime.el (ldap-search): Declare. (smime-cert-by-ldap-1): Require ldap on Emacs.
author Glenn Morris <rgm@gnu.org>
date Sun, 31 Oct 2010 19:11:34 -0700
parents c6f71b33c8ee
children c9da32007d99
files lisp/gnus/ChangeLog lisp/gnus/smime.el
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sun Oct 31 19:07:01 2010 -0700
+++ b/lisp/gnus/ChangeLog	Sun Oct 31 19:11:34 2010 -0700
@@ -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.
 
--- a/lisp/gnus/smime.el	Sun Oct 31 19:07:01 2010 -0700
+++ b/lisp/gnus/smime.el	Sun Oct 31 19:11:34 2010 -0700
@@ -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)))