1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00

(dired-insert-directory): If dired-free-space-program

failed just delete its output.
This commit is contained in:
Andreas Schwab 2000-03-29 20:02:10 +00:00
parent 3d3df9e121
commit 8b0b6a7f28

View File

@ -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