From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 4 May 1994 22:58:06 +0000 (+0000)
Subject: Delete empty directories when requested.
X-Git-Tag: 20090517-FFI~7178
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2d376e0d2eed79883c42565c6dc8147f80c07b59;p=mit-scheme.git

Delete empty directories when requested.
---

diff --git a/v7/src/edwin/dired.scm b/v7/src/edwin/dired.scm
index f5e88399e..2d1db296b 100644
--- a/v7/src/edwin/dired.scm
+++ b/v7/src/edwin/dired.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: dired.scm,v 1.145 1994/03/23 22:47:05 cph Exp $
+;;;	$Id: dired.scm,v 1.146 1994/05/04 22:58:06 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-94 Massachusetts Institute of Technology
 ;;;
@@ -760,8 +760,9 @@ Actions controlled by variables list-directory-brief-switches
 
 (define (dired-kill-file! filename)
   (let ((deleted?
-	 (catch-file-errors (lambda () false)
-			    (lambda () (delete-file (car filename)) true))))
+	 (if (file-directory? filename)
+	     (delete-directory-no-errors filename)
+	     (delete-file-no-errors filename))))
     (if deleted?
 	(with-read-only-defeated (cdr filename)
 	  (lambda ()