# HG changeset patch # User Jason Rumney # Date 971985013 0 # Node ID 070d01d7f8718fad8324b97c61eb17652f8c4fb0 # Parent bbd3be4db5f20b1cbbb0c82bd284d664c32134f6 (dired-insert-directory): Do not let errors signalled by attempt to run dired-free-space-program prevent dired from working. diff -r bbd3be4db5f2 -r 070d01d7f871 lisp/dired.el --- a/lisp/dired.el Thu Oct 19 19:25:53 2000 +0000 +++ b/lisp/dired.el Thu Oct 19 19:50:13 2000 +0000 @@ -687,21 +687,23 @@ (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