Avoid double load of password-cache.

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index c5a0387..a63e341 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -29,8 +29,9 @@
 (eval-when-compile (require 'cl))
 
 (if (featurep 'xemacs)
-    (or (load "password-cache" t)
-        ;; Not all XEmacs versions support `noerror' arg of `require'.
+    ;; 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)))

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index 894f144..3fef974 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -81,8 +81,9 @@
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
 (if (featurep 'xemacs)
-    (or (load "password-cache" t)
-        ;; Not all XEmacs versions support `noerror' arg of `require'.
+    ;; 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)))

diff --git a/lisp/smime.el b/lisp/smime.el
index fc9da77..d4b3a8f 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -127,8 +127,9 @@
 (require 'dig)
 
 (if (featurep 'xemacs)
-    (or (load "password-cache" t)
-        ;; Not all XEmacs versions support `noerror' arg of `require'.
+    ;; 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)))