Mercurial > emacs
diff lisp/gnus/smime.el @ 87454:0cbc451989a7
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-967
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 28 Dec 2007 22:26:31 +0000 |
parents | 9b1073650b18 |
children | 107ccd98fa12 |
line wrap: on
line diff
--- a/lisp/gnus/smime.el Fri Dec 28 22:26:14 2007 +0000 +++ b/lisp/gnus/smime.el Fri Dec 28 22:26:31 2007 +0000 @@ -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