Make loading of password-cache or password compatible with XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ed9305..3940fe2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-16  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mml-sec.el, sieve-manage.el, smime.el: Make loading of password-cache
+       or password compatible with XEmacs.
+
 2007-12-15  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-art.el (article-verify-x-pgp-sig): Add reference to X-PGP-Sig

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index e7ecc06..c5a0387 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -27,8 +27,13 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(or (require 'password-cache nil t)
-    (require 'password))
+
+(if (featurep 'xemacs)
+    (or (load "password-cache" t)
+        ;; Not all XEmacs versions support `noerror' arg of `require'.
+       (require 'password))
+  (or (require 'password-cache nil t)
+      (require 'password)))
 
 (autoload 'mml2015-sign "mml2015")
 (autoload 'mml2015-encrypt "mml2015")

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index a4b7636..894f144 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -79,8 +79,14 @@
 ;; For Emacs < 22.2.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-(or (require 'password-cache nil t)
-    (require 'password))
+
+(if (featurep 'xemacs)
+    (or (load "password-cache" t)
+        ;; Not all XEmacs versions support `noerror' arg of `require'.
+       (require 'password))
+  (or (require 'password-cache nil t)
+      (require 'password)))
+
 (eval-when-compile
   (require 'sasl)
   (require 'starttls))

diff --git a/lisp/smime.el b/lisp/smime.el
index 105cadf..fc9da77 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -125,8 +125,14 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
-(or (require 'password-cache nil t)
-    (require 'password))
+
+(if (featurep 'xemacs)
+    (or (load "password-cache" t)
+        ;; Not all XEmacs versions support `noerror' arg of `require'.
+       (require 'password))
+  (or (require 'password-cache nil t)
+      (require 'password)))
+
 (eval-when-compile (require 'cl))
 
 (eval-and-compile