1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 928c89cc848..2670a66a7c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 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)
         (epa-file-write-region): Remove redundant check of
         epa-pinentry-mode.