Use DELETE-FILE-NO-ERRORS instead of DELETE-FILE and

CATCH-FILE-ERRORS.

diff --git a/v7/src/edwin/autosv.scm b/v7/src/edwin/autosv.scm
index fb51e775057392f0fe0757707e6ac1f0cdbd285b..ec5a4b5db120738d2be90609f4a07be6a68aa5a9 100644 (file)
--- a/v7/src/edwin/autosv.scm
+++ b/v7/src/edwin/autosv.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: autosv.scm,v 1.29 1994/03/08 20:16:41 cph Exp $
+;;;    $Id: autosv.scm,v 1.30 1994/05/04 22:56:50 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-94 Massachusetts Institute of Technology
 ;;;
@@ -154,10 +154,7 @@ This file is not the file you visited; that changes only when you save."
              (not (let ((pathname (buffer-pathname buffer)))
                     (and pathname
                          (pathname=? auto-save-pathname pathname))))
-             (catch-file-errors (lambda () false)
-               (lambda ()
-                 (delete-file auto-save-pathname)
-                 true))))))
+             (delete-file-no-errors auto-save-pathname)))))
 
 (define (rename-auto-save-file! buffer)
   (let ((old-pathname (buffer-auto-save-pathname buffer)))

diff --git a/v7/src/edwin/fileio.scm b/v7/src/edwin/fileio.scm
index 2876e1027a94611e97607e596638c2e6f65491e3..153062661d9679e58f7cb70f8fdd501f767493f6 100644 (file)
--- a/v7/src/edwin/fileio.scm
+++ b/v7/src/edwin/fileio.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: fileio.scm,v 1.119 1993/08/13 23:20:57 cph Exp $
+;;;    $Id: fileio.scm,v 1.120 1994/05/04 22:56:34 cph Exp $
 ;;;
-;;;    Copyright (c) 1986, 1989-1993 Massachusetts Institute of Technology
+;;;    Copyright (c) 1986, 1989-94 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -463,9 +463,7 @@ Otherwise, a message is written both before and after long file writes."
                            (if rename-back?
                                (begin
                                  (set! rename-back? false)
-                                 (catch-file-errors
-                                  (lambda () unspecific)
-                                  (lambda () (delete-file old))))))
+                                 (delete-file-no-errors old))))
                          (lambda ()
                            (if rename-back?
                                (begin
@@ -661,9 +659,7 @@ Otherwise, a message is written both before and after long file writes."
                              (copy-file truename backup-pathname)
                              false)
                            (begin
-                             (catch-file-errors
-                              (lambda () unspecific)
-                              (lambda () (delete-file backup-pathname)))
+                             (delete-file-no-errors backup-pathname)
                              (rename-file truename backup-pathname)
                              (file-modes backup-pathname)))))))
                (set-buffer-backed-up?!
@@ -675,11 +671,7 @@ Otherwise, a message is written both before and after long file writes."
                              (string-append
                               "Delete excess backup versions of "
                               (->namestring (buffer-pathname buffer))))))
-                   (for-each (lambda (target)
-                               (catch-file-errors
-                                (lambda () unspecific)
-                                (lambda () (delete-file target))))
-                             targets))
+                   (for-each delete-file-no-errors targets))
                modes)))))))
 \f
 ;;;; Utilities for text end-of-line translation

diff --git a/v7/src/edwin/rmail.scm b/v7/src/edwin/rmail.scm
index 31a6a057301dc09bc702b4701cd81b6ef1d270eb..4460bde6014e03580d6beac49dbd89917b41b0bc 100644 (file)
--- a/v7/src/edwin/rmail.scm
+++ b/v7/src/edwin/rmail.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: rmail.scm,v 1.32 1994/03/22 17:08:20 cph Exp $
+;;;    $Id: rmail.scm,v 1.33 1994/05/04 22:55:54 cph Exp $
 ;;;
-;;;    Copyright (c) 1991-1993 Massachusetts Institute of Technology
+;;;    Copyright (c) 1991-94 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -437,10 +437,7 @@ and use that file as the inbox."
                               false
                               'NO-BACKUP))))
        (if delete-inboxes?
-           (for-each (lambda (pathname)
-                       (catch-file-errors (lambda () unspecific)
-                                          (lambda () (delete-file pathname))))
-                     inserted-inboxes))
+           (for-each delete-file-no-errors inserted-inboxes))
        (cond ((> new-messages 0)
               (message new-messages
                        " new message"