From: Glenn Morris <rgm@gnu.org>
Date: Sun, 3 Oct 2010 02:09:53 +0000 (-0700)
Subject: * lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~228
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3615c80cc0300ea032eb7379dd0055f13686957f;p=emacs.git

* lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 841c3c0832d..24f71d5a674 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
+	* smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.
+
 	* gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft.
 
 	* gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft.
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 2492007f583..c3ef6898453 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -1,7 +1,7 @@
 ;;; smime.el --- S/MIME support library
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: SMIME X.509 PEM OpenSSL
@@ -591,9 +591,7 @@ A string or a list of strings is returned."
   "Get cetificate for MAIL from the ldap server at HOST."
   (let ((ldapresult
 	 (funcall
-	  (if (or (featurep 'xemacs)
-		  ;; For Emacs >= 22 we don't need smime-ldap.el
-		  (< emacs-major-version 22))
+	  (if (featurep 'xemacs)
 	      (progn
 		(require 'smime-ldap)
 		'smime-ldap-search)