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

epg: Fix callback argument type check

Browse Source 
* epg.el (epg-context-set-passphrase-callback)
(epg-context-set-progress-callback): Check if the CALLBACK
argument is a function, instead of a cons.
This commit is contained in:
Daiki Ueno 2014-11-18 14:52:45 +09:00
parent 5224be2f74
commit 5c249e2a04
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2014-11-18 Daiki Ueno <ueno@gnu.org>
* epg.el (epg-context-set-passphrase-callback)
(epg-context-set-progress-callback): Check if the CALLBACK
argument is a function, instead of a cons.
2014-11-18 Daiki Ueno <ueno@gnu.org>
* epa-file.el (epa-file-insert-file-contents)

12
lisp/epg.el
View File

@ -252,9 +252,9 @@ installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase
query by itself and Emacs can intercept them."
;; (declare (obsolete setf "25.1"))
(setf (epg-context-passphrase-callback context)
(if (consp passphrase-callback) ;FIXME: functions can also be consp!
passphrase-callback
(list passphrase-callback))))
(if (functionp passphrase-callback)
(list passphrase-callback)
passphrase-callback)))
(defun epg-context-set-progress-callback (context
progress-callback)
@ -268,9 +268,9 @@ description, the character to display a progress unit, the
current amount done, the total amount to be done, and the
callback data (if any)."
(setf (epg-context-progress-callback context)
(if (consp progress-callback) ;FIXME: could be a function!
progress-callback
(list progress-callback))))
(if (functionp progress-callback)
(list progress-callback)
progress-callback)))
(defun epg-context-set-signers (context signers)
"Set the list of key-id for signing."