2004-05-19 Lars Magne Ingebrigtsen <larsi@gnus.org>

	* pgg-pgp.el (pgg-pgp-verify-region): Clean up.

2004-05-19  Michael Schierl  <schierlm-usenet@gmx.de>

	* pgg-pgp.el (pgg-pgp-verify-region): Default when signature
	isn't a string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f73d987..7b45b9d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * pgg-pgp.el (pgg-pgp-verify-region): Clean up.
+
+2004-05-19  Michael Schierl  <schierlm-usenet@gmx.de>
+
+       * pgg-pgp.el (pgg-pgp-verify-region): Default when signature
+       isn't a string.
+
 2004-05-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-draft.el (gnus-draft-send): Bind

diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index 4eb76ee..13e084d 100644 (file)
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -194,9 +194,11 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
                jka-compr-compression-info-list jam-zcat-filename-list)
            (write-region start end orig-file)))
       (set-default-file-modes orig-mode))
-    (when (stringp signature)
-      (copy-file signature (setq signature (concat orig-file ".asc")))
-      (setq args (append args (list signature orig-file))))
+    (if (stringp signature)
+       (progn
+         (copy-file signature (setq signature (concat orig-file ".asc")))
+         (setq args (append args (list signature orig-file))))
+      (setq args (append args (list orig-file))))
     (pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
     (delete-file orig-file)
     (if signature (delete-file signature))