Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(dired-insert-directory): Do not let errors signalled by

Browse source 
attempt to run dired-free-space-program prevent dired from working.
This commit is contained in:
Jason Rumney 2000-10-19 19:50:13 +00:00
parent 0b6bb67088
commit 783e823086
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lisp/dired.el
View file

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