# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1286071793 25200
# Node ID 38ee498456a46aaed9e42d92c82ea13c58b56805
# Parent  60a469b3a72c7b87474cf4f138ffdd973ea6e32c
* lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.

diff -r 60a469b3a72c -r 38ee498456a4 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Oct 02 19:07:11 2010 -0700
+++ b/lisp/gnus/ChangeLog	Sat Oct 02 19:09:53 2010 -0700
@@ -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 -r 60a469b3a72c -r 38ee498456a4 lisp/gnus/smime.el
--- a/lisp/gnus/smime.el	Sat Oct 02 19:07:11 2010 -0700
+++ b/lisp/gnus/smime.el	Sat Oct 02 19:09:53 2010 -0700
@@ -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 @@
   "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)