[Emacs-diffs] /srv/bzr/emacs/trunk r101746: * lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.

[Glenn Morris]

------------------------------------------------------------
revno: 101746
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 19:09:53 -0700
message:
  * lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/smime.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-03 02:07:11 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-03 02:09:53 +0000
@@ -1,5 +1,7 @@
 2010-10-03  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/smime.el'
--- a/lisp/gnus/smime.el        2010-09-30 08:39:23 +0000
+++ b/lisp/gnus/smime.el        2010-10-03 02:09:53 +0000
@@ -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 <address@hidden>
 ;; 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)