From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 19 Oct 2000 19:50:13 +0000 (+0000)
Subject: (dired-insert-directory): Do not let errors signalled by
X-Git-Tag: emacs-pretest-21.0.90~739
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=783e8230866622b5469c8dd320bfab59e78079d7;p=emacs.git

(dired-insert-directory): Do not let errors signalled by
attempt to run dired-free-space-program prevent dired from working.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index 5308cdb7e1a..795ca3c3005 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -687,21 +687,23 @@ 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)))
-	      (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))))))))
+              (condition-case nil
+                  (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)))
+                (error (delete-region (- beg 7) (point)))))))))
     ;; Quote certain characters, unless ls quoted them for us.
     (if (not (string-match "b" dired-actual-switches))
 	(save-excursion