From: Andreas Schwab <schwab@suse.de>
Date: Wed, 29 Mar 2000 20:02:10 +0000 (+0000)
Subject: (dired-insert-directory): If dired-free-space-program
X-Git-Tag: emacs-pretest-21.0.90~4426
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b0b6a7f28fcd8a253ed090791c395c3e7fd0446;p=emacs.git

(dired-insert-directory): If dired-free-space-program
failed just delete its output.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index e5f704689c6..e9426d40288 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -681,18 +681,21 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh."
 	  (when (re-search-forward "total [0-9]+$" nil t)
 	    (insert "  free ")
 	    (let ((beg (point)))
-	      (call-process dired-free-space-program nil t nil
-			    dired-free-space-args
-			    (expand-file-name dir-or-list))
-	      (goto-char beg)
-	      (forward-line 1)
-	      (skip-chars-forward "^ \t")
-	      (forward-word 2)
-	      (skip-chars-forward " \t")
-	      (delete-region beg (point))
-	      (forward-word 1)
-	      (delete-region (point)
-			     (progn (forward-line 1) (point))))))))
+	      (if (zerop (call-process dired-free-space-program nil t nil
+				       dired-free-space-args
+				       (expand-file-name dir-or-list)))
+		  (progn
+		    (goto-char beg)
+		    (forward-line 1)
+		    (skip-chars-forward "^ \t")
+		    (forward-word 2)
+		    (skip-chars-forward " \t")
+		    (delete-region beg (point))
+		    (forward-word 1)
+		    (delete-region (point)
+				   (progn (forward-line 1) (point))))
+		;; The dired-free-space-program failed; delete its output
+		(delete-region (- beg 7) (point))))))))
     ;; Quote certain characters, unless ls quoted them for us.
     (if (not (string-match "b" dired-actual-switches))
 	(save-excursion