From b6d1fdb0e4fcb97bef3c44032ae7dde2354afde3 Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Fri, 29 Sep 2006 04:09:03 +0000
Subject: [PATCH] * epa.el (epa-verify-cleartext-in-region): Renamed from
 epa-verify-armor-in-region.

---
 ChangeLog |    3 +++
 epa.el    |   38 +++++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48064d5..7549f9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-29  Daiki Ueno  <ueno@unixuser.org>
 
+	* epa.el (epa-verify-cleartext-in-region): Renamed from
+	epa-verify-armor-in-region.
+
 	* epg.el (epg-passphrase-callback-function): Suggest to use
 	epa-passphrase-callback-function instead.
 	(epg-start-verify): Don't specify --verify if SIGNATURE is a
diff --git a/epa.el b/epa.el
index cbed315..e3d0824 100644
--- a/epa.el
+++ b/epa.el
@@ -706,8 +706,9 @@ Don't use this command in Lisp programs!"
 	(epa-display-verify-result (epg-context-result-for context 'verify)))))
 
 ;;;###autoload
-(defun epa-verify-armor-in-region (start end)
-  "Verify OpenPGP armors in the current region between START and END.
+(defun epa-verify-cleartext-in-region (start end)
+  "Verify OpenPGP cleartext signed messages in the current region
+between START and END.
 
 Don't use this command in Lisp programs!"
   (interactive "r")
@@ -716,20 +717,15 @@ Don't use this command in Lisp programs!"
       (narrow-to-region start end)
       (goto-char start)
       (let (armor-start armor-end)
-	(while (re-search-forward "-----BEGIN PGP\\( SIGNED\\)? MESSAGE-----$"
+	(while (re-search-forward "-----BEGIN PGP SIGNED MESSAGE-----$"
 				  nil t)
 	  (setq armor-start (match-beginning 0))
-	  (if (match-beginning 1)	;cleartext signed message
-	      (progn
-		(unless (re-search-forward "^-----BEGIN PGP SIGNATURE-----$"
+	  (unless (re-search-forward "^-----BEGIN PGP SIGNATURE-----$"
 					   nil t)
-		  (error "Invalid cleartext signed message"))
-		(setq armor-end (re-search-forward
-				 "^-----END PGP SIGNATURE-----$"
-				 nil t)))
-	    (setq armor-end (re-search-forward
-			     "^-----END PGP MESSAGE-----$"
-			     nil t)))
+	    (error "Invalid cleartext signed message"))
+	  (setq armor-end (re-search-forward
+			   "^-----END PGP SIGNATURE-----$"
+			   nil t))
 	  (unless armor-end
 	    (error "No armor tail"))
 	  (epa-verify-region armor-start armor-end))))))
@@ -798,7 +794,9 @@ If no one is selected, symmetric encryption will be performed.  ")))
 
 ;;;###autoload
 (defun epa-delete-keys (keys &optional allow-secret)
-  "Delete selected KEYS."
+  "Delete selected KEYS.
+
+Don't use this command in Lisp programs!"
   (interactive
    (let ((keys (epa--marked-keys)))
      (unless keys
@@ -813,7 +811,9 @@ If no one is selected, symmetric encryption will be performed.  ")))
 
 ;;;###autoload
 (defun epa-import-keys (file)
-  "Import keys from FILE."
+  "Import keys from FILE.
+
+Don't use this command in Lisp programs!"
   (interactive "fFile: ")
   (let ((context (epg-make-context)))
     (message "Importing %s..." (file-name-nondirectory file))
@@ -823,7 +823,9 @@ If no one is selected, symmetric encryption will be performed.  ")))
 
 ;;;###autoload
 (defun epa-export-keys (keys file)
-  "Export selected KEYS to FILE."
+  "Export selected KEYS to FILE.
+
+Don't use this command in Lisp programs!"
   (interactive
    (let ((keys (epa--marked-keys))
 	 default-name)
@@ -851,7 +853,9 @@ If no one is selected, symmetric encryption will be performed.  ")))
 ;;;###autoload
 (defun epa-sign-keys (keys &optional local)
   "Sign selected KEYS.
-If LOCAL is non-nil, the signature is marked as non exportable."
+If a prefix-arg is specified, the signature is marked as non exportable.
+
+Don't use this command in Lisp programs!"
   (interactive
    (let ((keys (epa--marked-keys)))
      (unless keys
-- 
1.7.10.4