Add optional arg to delete-file to force deletion (Bug#6070).

[gnu-emacs] / lisp / jka-compr.el

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 6df57d710e1b536232be466936ffefb758974428..e4311e13f283c17e3a7358bb44e9918876f5f3a9 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -181,8 +181,7 @@ to keep: LEN chars starting BEG chars from the beginning."
                          null-device))
                        jka-compr-acceptable-retval-list)
                  (jka-compr-error prog args infile message err-file))
-           (let (delete-by-moving-to-trash)
-             (delete-file err-file))))
+           (delete-file err-file t)))
 
       ;; Run the uncompression program directly.
       ;; We get the whole file and must delete what we don't want.
@@ -224,8 +223,7 @@ to keep: LEN chars starting BEG chars from the beginning."
                                           "")))
                   jka-compr-acceptable-retval-list)
                  (jka-compr-error prog args infile message err-file))
-           (let (delete-by-moving-to-trash)
-             (delete-file err-file))))
+           (delete-file err-file t)))
       (or (eq 0
              (apply 'call-process
                     prog infile (if (stringp output) temp output)
@@ -337,8 +335,7 @@ There should be no more than seven characters after the final `/'."
                                                (and append can-append) 'dont))
              (erase-buffer)) )
 
-         (let (delete-by-moving-to-trash)
-           (delete-file temp-file))
+         (delete-file temp-file t)
 
          (and
           compress-message
@@ -604,8 +601,7 @@ There should be no more than seven characters after the final `/'."
              (setq file (file-name-sans-extension file)))
            (setcar l file)))
 
-      (let (delete-by-moving-to-trash)
-       (delete-file local-copy)))
+      (delete-file local-copy))
 
     t))