# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1221530825 0
# Node ID ef3ca5fcb75166a8703f19c2c271135002ae19c7
# Parent  d313d777342f4102546db242a320ee709667820b
(epg-start-verify): Pass "--verify" to gpgsm.

diff -r d313d777342f -r ef3ca5fcb751 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 16 01:24:30 2008 +0000
+++ b/lisp/ChangeLog	Tue Sep 16 02:07:05 2008 +0000
@@ -1,3 +1,7 @@
+2008-09-16  Daiki Ueno  <ueno@unixuser.org>
+
+	* epg.el (epg-start-verify): Pass "--verify" to gpgsm.
+
 2008-09-15  Juanma Barranquero  <lekktu@gmail.com>
 
 	* vc-rcs.el (vc-rcs-steal-lock, vc-rcs-checkout): Fix docstring typos.
diff -r d313d777342f -r ef3ca5fcb751 lisp/epg.el
--- a/lisp/epg.el	Tue Sep 16 01:24:30 2008 +0000
+++ b/lisp/epg.el	Tue Sep 16 02:07:05 2008 +0000
@@ -2013,8 +2013,12 @@
 	    (process-send-eof (epg-context-process context))))
     ;; Normal (or cleartext) signature.
     (if (epg-data-file signature)
-	(epg--start context (list "--" (epg-data-file signature)))
-      (epg--start context '("-"))
+	(epg--start context (if (eq (epg-context-protocol context) 'CMS)
+				(list "--verify" "--" (epg-data-file signature))
+			      (list "--" (epg-data-file signature))))
+      (epg--start context (if (eq (epg-context-protocol context) 'CMS)
+			      '("--verify" "-")
+			    '("-")))
       (if (eq (process-status (epg-context-process context)) 'run)
 	  (process-send-string (epg-context-process context)
 			       (epg-data-string signature)))