aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-12-09 04:10:26 +0000
committerGlenn Morris2007-12-09 04:10:26 +0000
commit8d0f97a4a39b2624476ccc52452299fef53d1dc7 (patch)
treec7d0f545e62863e3bacfc0f9d4ac0f0047df936c
parented8a25dfa1cb441e81333968f7a5bc8852f5e3b8 (diff)
downloademacs-8d0f97a4a39b2624476ccc52452299fef53d1dc7.tar.gz
emacs-8d0f97a4a39b2624476ccc52452299fef53d1dc7.zip
(declare-function): Add compatibility definition.
(password-read-and-add): Declare as a function.
-rw-r--r--lisp/gnus/ChangeLog7
-rw-r--r--lisp/gnus/smime.el4
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 29c80847c23..e271520f14e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,8 +3,8 @@
3 * gnus-uu.el (gnus-uu-yenc-article): Use insert-buffer-substring. 3 * gnus-uu.el (gnus-uu-yenc-article): Use insert-buffer-substring.
4 4
5 * gnus-art.el, gnus-spec.el, gnus-sum.el, gnus-util.el: 5 * gnus-art.el, gnus-spec.el, gnus-sum.el, gnus-util.el:
6 * message.el, mm-view.el: Add declare-function compatibility 6 * message.el, mm-view.el, smime.el: Add declare-function compatibility
7 declaration. 7 definition.
8 8
9 * gnus-art.el (w3-region, w3m-region, Info-menu): 9 * gnus-art.el (w3-region, w3m-region, Info-menu):
10 * gnus-spec.el (gnus-summary-from-or-to-or-newsgroups): 10 * gnus-spec.el (gnus-summary-from-or-to-or-newsgroups):
@@ -12,7 +12,8 @@
12 * gnus-util.el (mm-append-to-file, w32-focus-frame): 12 * gnus-util.el (mm-append-to-file, w32-focus-frame):
13 * message.el (mail-abbrev-in-expansion-header-p): 13 * message.el (mail-abbrev-in-expansion-header-p):
14 * mm-view.el (w3-do-setup, w3-region, w3-prepare-buffer) 14 * mm-view.el (w3-do-setup, w3-region, w3-prepare-buffer)
15 (w3m-detect-meta-charset, w3m-region): Declare as functions. 15 (w3m-detect-meta-charset, w3m-region):
16 * smime.el (password-read-and-add): Declare as functions.
16 17
172007-12-08 David Kastrup <dak@gnu.org> 182007-12-08 David Kastrup <dak@gnu.org>
18 19
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 31545c16044..bd9ce5a5c46 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -121,6 +121,9 @@
121 121
122;;; Code: 122;;; Code:
123 123
124;; For Emacs < 22.2.
125(eval-and-compile
126 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
124(require 'dig) 127(require 'dig)
125(or (require 'password-cache nil t) 128(or (require 'password-cache nil t)
126 (require 'password)) 129 (require 'password))
@@ -257,6 +260,7 @@ must be set in `ldap-host-parameters-alist'."
257 temporary-file-directory)))))) 260 temporary-file-directory))))))
258 261
259;; Password dialog function 262;; Password dialog function
263(declare-function password-read-and-add "password-cache" (prompt &optional key))
260 264
261(defun smime-ask-passphrase (&optional cache-key) 265(defun smime-ask-passphrase (&optional cache-key)
262 "Asks the passphrase to unlock the secret key. 266 "Asks the passphrase to unlock the secret key.