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

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

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


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1710 gnus/lisp/ChangeLog:7.1711
--- ChangeLog:7.1710	Sun Dec 16 05:23:18 2007
+++ ChangeLog	Sun Dec 16 19:31:16 2007
@@ -1,3 +1,8 @@
+2007-12-16  Reiner Steib  <[email protected]>
+
+	* mml-sec.el, sieve-manage.el, smime.el: Make loading of password-cache
+	or password compatible with XEmacs.
+
 2007-12-15  Reiner Steib  <[email protected]>
 
 	* gnus-art.el (article-verify-x-pgp-sig): Add reference to X-PGP-Sig
Index: mml-sec.el
diff -u gnus/lisp/mml-sec.el:7.18 gnus/lisp/mml-sec.el:7.19
--- mml-sec.el:7.18	Sun Dec  9 01:04:21 2007
+++ mml-sec.el	Sun Dec 16 19:31:16 2007
@@ -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")
Index: sieve-manage.el
diff -u gnus/lisp/sieve-manage.el:7.15 gnus/lisp/sieve-manage.el:7.16
--- sieve-manage.el:7.15	Sun Dec  9 23:46:32 2007
+++ sieve-manage.el	Sun Dec 16 19:31:16 2007
@@ -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))
Index: smime.el
diff -u gnus/lisp/smime.el:7.27 gnus/lisp/smime.el:7.28
--- smime.el:7.27	Sun Dec 16 05:23:18 2007
+++ smime.el	Sun Dec 16 19:31:16 2007
@@ -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