(declare-function): Add compatibility definition.

(password-read-and-add): Declare as a function.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 29c80847c23f64e7fa5421b68e93be99261d61e4..e271520f14eb619ff830e34d0143c960e3572911 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,8 +3,8 @@
        * gnus-uu.el (gnus-uu-yenc-article): Use insert-buffer-substring.
 
        * gnus-art.el, gnus-spec.el, gnus-sum.el, gnus-util.el:
-       * message.el, mm-view.el: Add declare-function compatibility
-       declaration.
+       * message.el, mm-view.el, smime.el: Add declare-function compatibility
+       definition.
 
        * gnus-art.el (w3-region, w3m-region, Info-menu):
        * gnus-spec.el (gnus-summary-from-or-to-or-newsgroups):
@@ -12,7 +12,8 @@
        * gnus-util.el (mm-append-to-file, w32-focus-frame):
        * message.el (mail-abbrev-in-expansion-header-p):
        * mm-view.el (w3-do-setup, w3-region, w3-prepare-buffer)
-       (w3m-detect-meta-charset, w3m-region): Declare as functions.
+       (w3m-detect-meta-charset, w3m-region):
+       * smime.el (password-read-and-add): Declare as functions.
 
 2007-12-08  David Kastrup  <dak@gnu.org>
 

diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 31545c16044f7842a1331bd3e2374e908db60c63..bd9ce5a5c466c4e0b5014e8c567bc3b350f8bec9 100644 (file)
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -121,6 +121,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
 (or (require 'password-cache nil t)
     (require 'password))
@@ -257,6 +260,7 @@ must be set in `ldap-host-parameters-alist'."
           temporary-file-directory))))))
 
 ;; Password dialog function
+(declare-function password-read-and-add "password-cache" (prompt &optional key))
 
 (defun smime-ask-passphrase (&optional cache-key)
   "Asks the passphrase to unlock the secret key.