Merge from gnus--devo--0

[bpt/emacs.git] / lisp / gnus / smime.el

diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 105cadf..34c5b41 100644 (file)
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -125,8 +125,11 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
-(or (require 'password-cache nil t)
-    (require 'password))
+
+(if (locate-library "password-cache")
+    (require 'password-cache)
+  (require 'password))
+
 (eval-when-compile (require 'cl))
 
 (eval-and-compile