X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=c59706b238d81719468304fc88e97175977e617a;hb=59b227deceb57a37a91af9cc4edcb5039f0c0b3b;hp=2044980bbe7b1cd83d3f46bb10e82227674b59fa;hpb=9b150ba0ddfbf588675590a61946596bde41b14e;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index 2044980..c59706b 100644
--- a/epa.el
+++ b/epa.el
@@ -238,6 +238,14 @@ the separate window."
 	  (epg-sub-key-id (car (epg-key-sub-key-list
 				(widget-get widget :value))))))
 
+(if (fboundp 'encode-coding-string)
+    (defalias 'epa--encode-coding-string 'encode-coding-string)
+  (defalias 'epa--encode-coding-string 'identity))
+
+(if (fboundp 'decode-coding-string)
+    (defalias 'epa--decode-coding-string 'decode-coding-string)
+  (defalias 'epa--decode-coding-string 'identity))
+
 (defun epa-keys-mode ()
   "Major mode for `epa-list-keys'."
   (kill-all-local-variables)
@@ -342,7 +350,7 @@ If ARG is non-nil, mark the current line."
 		     (or (next-single-property-change point 'epa-list-keys)
 			 (point-max)))
       (goto-char point))
-    (epa-insert-keys context name mode)
+    (epa--insert-keys context name mode)
     (epa-keys-mode)
     (widget-setup)
     (set-keymap-parent (current-local-map) widget-keymap))
@@ -351,7 +359,7 @@ If ARG is non-nil, mark the current line."
   (goto-char (point-min))
   (pop-to-buffer (current-buffer)))
 
-(defun epa-insert-keys (context name mode)
+(defun epa--insert-keys (context name mode)
   (save-excursion
     (save-restriction
       (narrow-to-region (point) (point))
@@ -424,17 +432,17 @@ If SECRET is non-nil, list secret keys instead of public keys."
       (insert "\n\n")
       (if names
 	  (while names
-	    (epa-insert-keys context (car names) secret)
+	    (epa--insert-keys context (car names) secret)
 	    (if (get-text-property (point) 'epa-list-keys)
 		(epa-mark))
 	    (goto-char (point-max))
 	    (setq names (cdr names)))
 	(if secret
 	    (progn
-	      (epa-insert-keys context nil secret)
+	      (epa--insert-keys context nil secret)
 	      (if (get-text-property (point) 'epa-list-keys)
 		  (epa-mark)))
-	  (epa-insert-keys context nil nil)))
+	  (epa--insert-keys context nil nil)))
       (epa-keys-mode)
       (widget-setup)
       (set-keymap-parent (current-local-map) widget-keymap)
@@ -693,7 +701,7 @@ Don't use this command in Lisp programs!"
       (message "Decrypting...done")
       (delete-region start end)
       (goto-char start)
-      (insert (decode-coding-string plain coding-system-for-read))
+      (insert (epa--decode-coding-string plain coding-system-for-read))
       (if (epg-context-result-for context 'verify)
 	  (epa-display-info (epg-verify-result-to-string
 			     (epg-context-result-for context 'verify)))))))
@@ -736,7 +744,7 @@ Don't use this command in Lisp programs!"
     (epg-context-set-progress-callback context
 				       #'epa-progress-callback-function)
     (epg-verify-string context
-		       (encode-coding-string
+		       (epa--encode-coding-string
 			(buffer-substring start end)
 			coding-system-for-write))
     (if (epg-context-result-for context 'verify)
@@ -801,8 +809,10 @@ d - Create a detached signature
   (save-excursion
     (let ((context (epg-make-context))
 	  signature)
-      (epg-context-set-armor context epa-armor)
-      (epg-context-set-textmode context epa-textmode)
+      ;;(epg-context-set-armor context epa-armor)
+      (epg-context-set-armor context t)
+      ;;(epg-context-set-textmode context epa-textmode)
+      (epg-context-set-textmode context t)
       (epg-context-set-signers context signers)
       (epg-context-set-passphrase-callback context
 					   #'epa-passphrase-callback-function)
@@ -810,13 +820,13 @@ d - Create a detached signature
 					 #'epa-progress-callback-function)
       (message "Signing...")
       (setq signature (epg-sign-string context
-				       (encode-coding-string
+				       (epa--encode-coding-string
 					(buffer-substring start end)
 					coding-system-for-write)
 				       mode))
       (message "Signing...done")
       (delete-region start end)
-      (insert (decode-coding-string signature coding-system-for-read)))))
+      (insert (epa--decode-coding-string signature coding-system-for-read)))))
 
 ;;;###autoload
 (defun epa-encrypt-region (start end recipients)
@@ -830,15 +840,17 @@ If no one is selected, symmetric encryption will be performed.  ")))
   (save-excursion
     (let ((context (epg-make-context))
 	  cipher)
-      (epg-context-set-armor context epa-armor)
-      (epg-context-set-textmode context epa-textmode)
+      ;;(epg-context-set-armor context epa-armor)
+      (epg-context-set-armor context t)
+      ;;(epg-context-set-textmode context epa-textmode)
+      (epg-context-set-textmode context t)
       (epg-context-set-passphrase-callback context
 					   #'epa-passphrase-callback-function)
       (epg-context-set-progress-callback context
 					 #'epa-progress-callback-function)
       (message "Encrypting...")
       (setq cipher (epg-encrypt-string context
-				       (encode-coding-string
+				       (epa--encode-coding-string
 					(buffer-substring start end)
 					coding-system-for-write)
 				       recipients))
@@ -914,6 +926,18 @@ Don't use this command in Lisp programs!"
     (message "Exporting to %s...done" (file-name-nondirectory file))))
 
 ;;;###autoload
+(defun epa-insert-keys (keys)
+  "Insert selected KEYS after the point.
+
+Don't use this command in Lisp programs!"
+  (interactive
+   (list (epa-select-keys (epg-make-context) "Select keys to export.  ")))
+  (let ((context (epg-make-context)))
+    ;;(epg-context-set-armor context epa-armor)
+    (epg-context-set-armor context t)
+    (insert (epg-export-keys-to-string context keys))))
+
+;;;###autoload
 (defun epa-sign-keys (keys &optional local)
   "Sign selected KEYS.
 If a prefix-arg is specified, the signature is marked as non exportable.