mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00
Code Issues Releases Activity

(epg-make-context, epg-context-set-passphrase-callback)

Browse Source 
(epg-context-set-progress-callback): Make sure the callback is a
cons of a function and a handback.  Update all callers.
This commit is contained in:
Daiki Ueno 2008-08-21 03:45:14 +00:00
parent a2d3af1ce6
commit 7c0ffa6da6
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2008-08-21 Daiki Ueno <ueno@unixuser.org>
* epg.el (epg-make-context, epg-context-set-passphrase-callback)
(epg-context-set-progress-callback): Make sure the callback is a
cons of a function and a handback. Update all callers.
2008-08-20 David Reitter <david.reitter@gmail.com>
* term/ns-win.el (ns-cursor-blink-rate, ns-cursor-blink-mode): Remove.

24
lisp/epg.el
View File

@ -185,7 +185,7 @@
(cons 'epg-context
(vector (or protocol 'OpenPGP) armor textmode include-certs
cipher-algorithm digest-algorithm compress-algorithm
#'epg-passphrase-callback-function
(list #'epg-passphrase-callback-function)
nil
nil nil nil nil nil nil)))
@ -328,7 +328,9 @@ This function is for internal use only."
"Set the function used to query passphrase."
(unless (eq (car-safe context) 'epg-context)
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aset (cdr context) 7 passphrase-callback))
(aset (cdr context) 7 (if (consp passphrase-callback)
passphrase-callback
(list passphrase-callback))))
(defun epg-context-set-progress-callback (context
progress-callback)
@ -336,7 +338,9 @@ This function is for internal use only."
If optional argument HANDBACK is specified, it is passed to PROGRESS-CALLBACK."
(unless (eq (car-safe context) 'epg-context)
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aset (cdr context) 8 progress-callback))
(aset (cdr context) 8 (if (consp progress-callback)
progress-callback
(list progress-callback))))
(defun epg-context-set-signers (context signers)
"Set the list of key-id for signing."
@ -1239,13 +1243,10 @@ This function is for internal use only."
(progn
(setq passphrase
(funcall
(if (consp (epg-context-passphrase-callback context))
(car (epg-context-passphrase-callback context))
(epg-context-passphrase-callback context))
(car (epg-context-passphrase-callback context))
context
epg-key-id
(if (consp (epg-context-passphrase-callback context))
(cdr (epg-context-passphrase-callback context)))))
(cdr (epg-context-passphrase-callback context))))
(when passphrase
(setq passphrase-with-new-line (concat passphrase "\n"))
(epg--clear-string passphrase)
@ -1493,16 +1494,13 @@ This function is for internal use only."
(if (and (epg-context-progress-callback context)
(string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
string))
(funcall (if (consp (epg-context-progress-callback context))
(car (epg-context-progress-callback context))
(epg-context-progress-callback context))
(funcall (car (epg-context-progress-callback context))
context
(match-string 1 string)
(match-string 2 string)
(string-to-number (match-string 3 string))
(string-to-number (match-string 4 string))
(if (consp (epg-context-progress-callback context))
(cdr (epg-context-progress-callback context))))))
(cdr (epg-context-progress-callback context)))))
(defun epg--status-ENC_TO (context string)
(if (string-match "\\`\\([0-9A-Za-z]+\\) \\([0-9]+\\) \\([0-9]+\\)" string)