[Emacs-diffs] emacs/lisp ChangeLog epg.el

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       09/09/11 22:46:18

Modified files:
        lisp           : ChangeLog epg.el 

Log message:
        (epg-context-set-passphrase-callback)
        (epg-context-set-progress-callback): Add more description about
        callback function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16135&r2=1.16136
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epg.el?cvsroot=emacs&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16135
retrieving revision 1.16136
diff -u -b -r1.16135 -r1.16136
--- ChangeLog   11 Sep 2009 22:27:32 -0000      1.16135
+++ ChangeLog   11 Sep 2009 22:46:14 -0000      1.16136
@@ -2,6 +2,9 @@
 
        * 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
+       callback function.
 
 2009-09-11  Stefan Monnier  <address@hidden>
 

Index: epg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epg.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- epg.el      11 Sep 2009 22:27:36 -0000      1.14
+++ epg.el      11 Sep 2009 22:46:17 -0000      1.15
@@ -328,7 +328,12 @@
 
 (defun epg-context-set-passphrase-callback (context
                                            passphrase-callback)
-  "Set the function used to query passphrase."
+  "Set the function used to query passphrase.
+
+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)
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 7 (if (consp passphrase-callback)
@@ -338,7 +343,14 @@
 (defun epg-context-set-progress-callback (context
                                          progress-callback)
   "Set the function which handles progress update.
-If optional argument HANDBACK is specified, it is passed to PROGRESS-CALLBACK."
+
+PROGRESS-CALLBACK is either a function, or a cons-cell whose
+car is a function and cdr is a callback data.
+
+The function gets five arguments: the context, the operation
+description, the character to display a progress unit, the
+current amount done, the total amount to be done, and the
+callback data (if any)."
   (unless (eq (car-safe context) 'epg-context)
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 8 (if (consp progress-callback)