Mercurial > emacs

changeset 97587:8324c394a51c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Daiki Ueno <ueno@unixuser.org>
date Thu, 21 Aug 2008 03:45:14 +0000
parents 56d71f056b26
children a32c3ff6e2b1
files lisp/ChangeLog lisp/epg.el
diffstat 2 files changed, 17 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Aug 21 02:57:36 2008 +0000
+++ b/lisp/ChangeLog	Thu Aug 21 03:45:14 2008 +0000
@@ -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.
--- a/lisp/epg.el	Thu Aug 21 02:57:36 2008 +0000
+++ b/lisp/epg.el	Thu Aug 21 03:45:14 2008 +0000
@@ -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 @@
   "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 @@
 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 @@
 	      (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 @@
   (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)