diff lisp/epg.el @ 108851:cb093dac3d58

Merge from mainline.

--- a/lisp/epg.el	Thu May 27 22:44:41 2010 +0000
+++ b/lisp/epg.el	Fri May 28 00:48:45 2010 +0000
@@ -1899,7 +1899,7 @@
 	  ;; Cleanup the tempfile.
 	  (and tempfile
 	       (file-exists-p tempfile)
-	       (delete-file tempfile t))
+	       (delete-file tempfile))
 	  ;; Cleanup the tempdir.
 	  (and tempdir
 	       (file-directory-p tempdir)
@@ -1999,7 +1999,7 @@
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if (file-exists-p input-file)
-	  (delete-file input-file t))
+	  (delete-file input-file))
       (epg-reset context))))
 
 (defun epg-start-verify (context signature &optional signed-text)
@@ -2203,7 +2203,7 @@
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file
-	  (delete-file input-file t))
+	  (delete-file input-file))
       (epg-reset context))))
 
 (defun epg-start-encrypt (context plain recipients
@@ -2323,7 +2323,7 @@
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file
-	  (delete-file input-file t))
+	  (delete-file input-file))
       (epg-reset context))))
 
 (defun epg-start-export-keys (context keys)