From: ueno <ueno>
Date: Tue, 20 Nov 2007 01:47:36 +0000 (+0000)
Subject: Revert the last change.
X-Git-Tag: emacs-merge-branchpoint~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9f79e9134b5fe90370aa91918dbc98936e4a567;p=elisp%2Fepg.git

Revert the last change.
---

diff --git a/ChangeLog b/ChangeLog
index 28b52c3..8d13601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-2007-11-11  Daiki Ueno  <ueno@unixuser.org>
-
-	* epg.el (epg-make-context): New slot "operation-data".
-	(epg--process-filter): Pick up status handler from "operation-data".
-	(epg-start-edit-key): New function.
-	(epg-edit-key): New function.
-	(epg-reset): Clear "operation" and "operation-data" slots.
-
 2007-09-05  Daiki Ueno  <ueno@unixuser.org>
 
 	* EasyPG: Version 0.0.15 released.
diff --git a/epg.el b/epg.el
index f0f57c8..ea0d4a1 100644
--- a/epg.el
+++ b/epg.el
@@ -190,8 +190,7 @@
 		cipher-algorithm digest-algorithm compress-algorithm
 		#'epg-passphrase-callback-function
 		nil
-		nil nil nil nil nil nil
-		(make-vector 31 0))))
+		nil nil nil nil nil nil)))
 
 (defun epg-context-protocol (context)
   "Return the protocol used within CONTEXT."
@@ -286,12 +285,6 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aref (cdr context) 14))
 
-(defun epg-context-operation-data (context)
-  "Return the obarray of the current cryptographic operation."
-  (unless (eq (car-safe context) 'epg-context)
-    (signal 'wrong-type-argument (list 'epg-context-p context)))
-  (aref (cdr context) 15))
-
 (defun epg-context-set-protocol (context protocol)
   "Set the protocol used within CONTEXT."
   (unless (eq (car-safe context) 'epg-context)
@@ -1152,14 +1145,8 @@ This function is for internal use only."
 		  (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
 		      (let* ((status (match-string 1))
 			     (string (match-string 2))
-			     (handler-name (concat "epg--status-" status))
-			     (symbol (or (if (epg-context-operation-data
-					      epg-context)
-					     (intern-soft
-					      handler-name
-					      (epg-context-operation-data
-					       epg-context)))
-					 (intern-soft handler-name))))
+			     (symbol (intern-soft (concat "epg--status-"
+							  status))))
 			(if (member status epg-pending-status-list)
 			    (setq epg-pending-status-list nil))
 			(if (and symbol
@@ -1198,9 +1185,7 @@ This function is for internal use only."
   (if (and (epg-context-process context)
 	   (buffer-live-p (process-buffer (epg-context-process context))))
       (kill-buffer (process-buffer (epg-context-process context))))
-  (epg-context-set-process context nil)
-  (epg-context-set-operation nil)
-  (fillarray (epg-context-operation-data context)))
+  (epg-context-set-process context nil))
 
 (defun epg-delete-output-file (context)
   "Delete the output file of CONTEXT."
@@ -2491,32 +2476,6 @@ If you are unsure, use synchronous version of this function
     (epg-reset context)))
 
 ;;;###autoload
-(defun epg-start-edit-key (context key)
-  "Initiate an edit key operation.
-
-If you use this function, you will need to wait for the completion of
-`epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
-If you are unsure, use synchronous version of this function
-`epg-edit-key' instead."
-  (epg-context-set-operation context 'edit-key)
-  (epg-context-set-result context nil)
-  (epg--start context (list "--with-colons" "--edit-key" "--"
-			    (epg-sub-key-id (car (epg-key-sub-key-list key))))))
-
-;;;###autoload
-(defun epg-edit-key (context key)
-  "Edit KEY in the key ring."
-  (unwind-protect
-      (progn
-	(epg-start-edit-key context key)
-	(epg-wait-for-completion context)
-	(if (epg-context-result-for context 'error)
-	    (error "Edit key failed: %S"
-		   (epg-context-result-for context 'error))))
-    (epg-reset context)))
-
-;;;###autoload
 (defun epg-start-sign-keys (context keys &optional local)
   "Initiate a sign keys operation.