From: Daiki Ueno Date: Fri, 11 Sep 2009 22:48:03 +0000 (+0000) Subject: Fix the last commit. X-Git-Tag: emacs-pretest-23.1.90~1370 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97d4bdba7eb24d2c34365dbb263fea844d7a1474;p=emacs.git Fix the last commit. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8870cbd73cc..72e1da01396 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,7 +3,7 @@ * epg.el (epg-cipher-algorithm-alist): Add CAMELLIA. (epg-digest-algorithm-alist): Add SHA224. (epg-context-set-passphrase-callback) - (epg-context-set-progress-callback): Add more description about + (epg-context-set-progress-callback): Add description about callback function. 2009-09-11 Stefan Monnier 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." PASSPHRASE-CALLBACK is either a function, or a cons-cell whose car is a function and cdr is a callback data. + The function gets three arguments: the context, the key-id in question, and the callback data (if any)." (unless (eq (car-safe context) 'epg-context)