Fix epg's reliance on an implicit GnuPG command.

Previously, epg invoked GnuPG without an explicit command to verify
signatures.  Make that operation explicit.  Happily, this aligns how
gpg and gpgsm is invoked, so it actually makes the code simpler.

diff --git a/lisp/epg.el b/lisp/epg.el
index c3c26badbba6a5d4730ac617aa5202fd21cd93df..ceeb269b0709ca96557344dc2781001b519d8bb8 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1519,12 +1519,8 @@ If you are unsure, use synchronous version of this function
            (process-send-eof (epg-context-process context))))
     ;; Normal (or cleartext) signature.
     (if (epg-data-file signature)
-       (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" "-")
-                           '("-")))
+       (epg--start context (list "--verify" "--" (epg-data-file signature)))
+       (epg--start context '("--verify" "-"))
       (if (eq (process-status (epg-context-process context)) 'run)
          (process-send-string (epg-context-process context)
                               (epg-data-string signature)))