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

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

Simplify loading of password-cache or password.
Suggested by Glenn Morris <[email protected]>.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1719 gnus/lisp/ChangeLog:7.1720
--- ChangeLog:7.1719	Thu Dec 20 23:32:43 2007
+++ ChangeLog	Fri Dec 28 20:32:59 2007
@@ -1,3 +1,8 @@
+2007-12-28  Reiner Steib  <[email protected]>
+
+	* mml-sec.el, sieve-manage.el, smime.el: Simplify loading of
+	password-cache or password.  Suggested by Glenn Morris <[email protected]>.
+
 2007-12-21  Teodor Zlatanov  <[email protected]>
 
 	* imap.el (imap-authenticate): Use current-buffer instead of buffer,
@@ -25,9 +30,11 @@
 	* encrypt.el: Clarify documentation for the new pgg method.
 	(encrypt-file-alist): Add PGG option.
 	(encrypt-insert-file-contents, encrypt-write-file-contents): Use PGG
-	functionality.  Abstract password key and messaging to external functions.
+	functionality.  Abstract password key and messaging to external
+	functions.
 	(encrypt-password-key, encrypt-get-passphrase-if-needed)
-	(encrypt-message-method-and-cipher): Add new convenience external functions.
+	(encrypt-message-method-and-cipher): Add new convenience external
+	functions.
 	(encrypt-pgg-encode-buffer, encrypt-pgg-decode-buffer)
 	(encrypt-pgg-process-buffer): Add PGG functionality glue.
 
Index: mml-sec.el
diff -u gnus/lisp/mml-sec.el:7.20 gnus/lisp/mml-sec.el:7.21
--- mml-sec.el:7.20	Sun Dec 16 21:50:27 2007
+++ mml-sec.el	Fri Dec 28 20:32:59 2007
@@ -28,13 +28,9 @@
 
 (eval-when-compile (require 'cl))
 
-(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))
 
 (autoload 'mml2015-sign "mml2015")
 (autoload 'mml2015-encrypt "mml2015")
Index: sieve-manage.el
diff -u gnus/lisp/sieve-manage.el:7.17 gnus/lisp/sieve-manage.el:7.18
--- sieve-manage.el:7.17	Sun Dec 16 21:50:27 2007
+++ sieve-manage.el	Fri Dec 28 20:32:59 2007
@@ -80,13 +80,9 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
-(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 'sasl)
Index: smime.el
diff -u gnus/lisp/smime.el:7.29 gnus/lisp/smime.el:7.30
--- smime.el:7.29	Sun Dec 16 21:50:27 2007
+++ smime.el	Fri Dec 28 20:32:59 2007
@@ -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))