Merge from emacs--devo--0, emacs--rel--22

[gnus] / lisp / smime.el

diff --git a/lisp/smime.el b/lisp/smime.el
index d4b3a8f..ddf39cc 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -1,7 +1,7 @@
 ;;; smime.el --- S/MIME support library
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: SMIME X.509 PEM OpenSSL
@@ -126,13 +126,9 @@
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
 
-(if (featurep 'xemacs)
-    ;; Not all XEmacs versions support `noerror' arg of `require'.
-    (or (featurep 'password-cache)
-       (load "password-cache" t)
-       (require 'password))
-  (or (require 'password-cache nil t)
-      (require 'password)))
+(if (locate-library "password-cache")
+    (require 'password-cache)
+  (require 'password))
 
 (eval-when-compile (require 'cl))
 
@@ -249,7 +245,7 @@ If nil, use system defaults."
 If needed search base, binddn, passwd, etc. for the LDAP host
 must be set in `ldap-host-parameters-alist'."
   :type '(repeat (string :tag "Host name"))
-  :version "23.0" ;; No Gnus
+  :version "23.1" ;; No Gnus
   :group 'smime)
 
 (defvar smime-details-buffer "*OpenSSL output*")
@@ -735,5 +731,5 @@ The following commands are available:
 
 (provide 'smime)
 
-;;; arch-tag: e3f9b938-5085-4510-8a11-6625269c9a9e
+;; arch-tag: e3f9b938-5085-4510-8a11-6625269c9a9e
 ;;; smime.el ends here