aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2009-09-11 22:48:03 +0000
committerDaiki Ueno2009-09-11 22:48:03 +0000
commit97d4bdba7eb24d2c34365dbb263fea844d7a1474 (patch)
tree059373aa4bf0ad08d2dd7b06cbe07d721bbab603
parentb18508ddd0488fb16b5ecbc19bba1edc658d0951 (diff)
downloademacs-97d4bdba7eb24d2c34365dbb263fea844d7a1474.tar.gz
emacs-97d4bdba7eb24d2c34365dbb263fea844d7a1474.zip
Fix the last commit.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/epg.el1
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8870cbd73cc..72e1da01396 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,7 +3,7 @@
3 * epg.el (epg-cipher-algorithm-alist): Add CAMELLIA. 3 * epg.el (epg-cipher-algorithm-alist): Add CAMELLIA.
4 (epg-digest-algorithm-alist): Add SHA224. 4 (epg-digest-algorithm-alist): Add SHA224.
5 (epg-context-set-passphrase-callback) 5 (epg-context-set-passphrase-callback)
6 (epg-context-set-progress-callback): Add more description about 6 (epg-context-set-progress-callback): Add description about
7 callback function. 7 callback function.
8 8
92009-09-11 Stefan Monnier <monnier@iro.umontreal.ca> 92009-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/epg.el b/lisp/epg.el
index 22f18762c5b..64489858a6d 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -332,6 +332,7 @@ This function is for internal use only."
332 332
333PASSPHRASE-CALLBACK is either a function, or a cons-cell whose 333PASSPHRASE-CALLBACK is either a function, or a cons-cell whose
334car is a function and cdr is a callback data. 334car is a function and cdr is a callback data.
335
335The function gets three arguments: the context, the key-id in 336The function gets three arguments: the context, the key-id in
336question, and the callback data (if any)." 337question, and the callback data (if any)."
337 (unless (eq (car-safe context) 'epg-context) 338 (unless (eq (car-safe context) 'epg-context)