From 5c249e2a0470b1bc53d10b5f4cf303922933e280 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 18 Nov 2014 14:52:45 +0900 Subject: [PATCH] epg: Fix callback argument type check * epg.el (epg-context-set-passphrase-callback) (epg-context-set-progress-callback): Check if the CALLBACK argument is a function, instead of a cons. --- lisp/ChangeLog | 6 ++++++ lisp/epg.el | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 928c89cc848..2670a66a7c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-18 Daiki Ueno + + * 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 * epa-file.el (epa-file-insert-file-contents) diff --git a/lisp/epg.el b/lisp/epg.el index e4d8c1e1a02..20e67850693 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -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."