Changes committed gnus/lisp (mml-sec.el sieve-manage.el smime.el)

Modified: mml-sec.el sieve-manage.el smime.el

Avoid double load of password-cache.


Index: mml-sec.el
diff -u gnus/lisp/mml-sec.el:7.19 gnus/lisp/mml-sec.el:7.20
--- mml-sec.el:7.19	Sun Dec 16 19:31:16 2007
+++ mml-sec.el	Sun Dec 16 21:50:27 2007
@@ -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)))
Index: sieve-manage.el
diff -u gnus/lisp/sieve-manage.el:7.16 gnus/lisp/sieve-manage.el:7.17
--- sieve-manage.el:7.16	Sun Dec 16 19:31:16 2007
+++ sieve-manage.el	Sun Dec 16 21:50:27 2007
@@ -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)))
Index: smime.el
diff -u gnus/lisp/smime.el:7.28 gnus/lisp/smime.el:7.29
--- smime.el:7.28	Sun Dec 16 19:31:16 2007
+++ smime.el	Sun Dec 16 21:50:27 2007
@@ -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)))