Mercurial > emacs
changeset 110718:38ee498456a4
* lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 02 Oct 2010 19:09:53 -0700 |
parents | 60a469b3a72c |
children | 57c62fb00e39 |
files | lisp/gnus/ChangeLog lisp/gnus/smime.el |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)